Attachment #522212: Patch for checkin for bug #640118

View | Details | Raw Unified | Return to bug 640118
Collapse All | Expand All

(-)a/dom/plugins/PluginModuleChild.cpp (-9 / +9 lines)
Line     Link Here 
 Lines 1-27    Link Here 
1
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
1
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2
 * vim: sw=4 ts=4 et :
2
/* vim: sw=4 ts=4 et : */
3
 * ***** BEGIN LICENSE BLOCK *****
3
/* ***** BEGIN LICENSE BLOCK *****
4
 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
4
 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
5
 *
5
 *
6
 * The contents of this file are subject to the Mozilla Public License Version
6
 * The contents of this file are subject to the Mozilla Public License Version
7
 * 1.1 (the "License"); you may not use this file except in compliance with
7
 * 1.1 (the "License"); you may not use this file except in compliance with
8
 * the License. You may obtain a copy of the License at
8
 * the License. You may obtain a copy of the License at
9
 * http://www.mozilla.org/MPL/
9
 * http://www.mozilla.org/MPL/
10
 *
10
 *
11
 * Software distributed under the License is distributed on an "AS IS" basis,
11
 * Software distributed under the License is distributed on an "AS IS" basis,
12
 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
12
 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
13
 * for the specific language governing rights and limitations under the
13
 * for the specific language governing rights and limitations under the
14
 * License.
14
 * License.
15
 *
15
 *
16
 * The Original Code is Mozilla Plugin App.
16
 * The Original Code is Mozilla Plugin App.
17
 *
17
 *
18
 * The Initial Developer of the Original Code is
18
 * The Initial Developer of the Original Code is
19
 *   Ben Turner <bent.mozilla@gmail.com>.
19
 * Ben Turner <bent.mozilla@gmail.com>.
20
 * Portions created by the Initial Developer are Copyright (C) 2009
20
 * Portions created by the Initial Developer are Copyright (C) 2009
21
 * the Initial Developer. All Rights Reserved.
21
 * the Initial Developer. All Rights Reserved.
22
 *
22
 *
23
 * Contributor(s):
23
 * Contributor(s):
24
 *   Chris Jones <jones.chris.g@gmail.com>
24
 *   Chris Jones <jones.chris.g@gmail.com>
25
 *
25
 *
26
 * Alternatively, the contents of this file may be used under the terms of
26
 * Alternatively, the contents of this file may be used under the terms of
27
 * either the GNU General Public License Version 2 or later (the "GPL"), or
27
 * either the GNU General Public License Version 2 or later (the "GPL"), or
 Lines 100-121   static PRLibrary *sGtkLib = nsnull; Link Here 
100
static bool gDelayFlashFocusReplyUntilEval = false;
100
static bool gDelayFlashFocusReplyUntilEval = false;
101
// Used to fix GetWindowInfo problems with internal flash settings dialogs
101
// Used to fix GetWindowInfo problems with internal flash settings dialogs
102
static WindowsDllInterceptor sUser32Intercept;
102
static WindowsDllInterceptor sUser32Intercept;
103
typedef BOOL (WINAPI *GetWindowInfoPtr)(HWND hwnd, PWINDOWINFO pwi);
103
typedef BOOL (WINAPI *GetWindowInfoPtr)(HWND hwnd, PWINDOWINFO pwi);
104
static GetWindowInfoPtr sGetWindowInfoPtrStub = NULL;
104
static GetWindowInfoPtr sGetWindowInfoPtrStub = NULL;
105
static HWND sBrowserHwnd = NULL;
105
static HWND sBrowserHwnd = NULL;
106
#endif
106
#endif
107
107
108
PluginModuleChild::PluginModuleChild() :
108
PluginModuleChild::PluginModuleChild()
109
    mLibrary(0),
109
  : mLibrary(0)
110
    mQuirks(QUIRKS_NOT_INITIALIZED),
111
    mShutdownFunc(0),
112
    mInitializeFunc(0)
113
  , mPluginFilename("")
110
  , mPluginFilename("")
111
  , mQuirks(QUIRKS_NOT_INITIALIZED)
112
  , mShutdownFunc(0)
113
  , mInitializeFunc(0)
114
#if defined(OS_WIN) || defined(OS_MACOSX)
114
#if defined(OS_WIN) || defined(OS_MACOSX)
115
  , mGetEntryPointsFunc(0)
115
  , mGetEntryPointsFunc(0)
116
#elif defined(MOZ_WIDGET_GTK2)
116
#elif defined(MOZ_WIDGET_GTK2)
117
  , mNestedLoopTimerId(0)
117
  , mNestedLoopTimerId(0)
118
#elif defined(MOZ_WIDGET_QT)
118
#elif defined(MOZ_WIDGET_QT)
119
  , mNestedLoopTimerObject(0)
119
  , mNestedLoopTimerObject(0)
120
#endif
120
#endif
121
#ifdef OS_WIN
121
#ifdef OS_WIN

Return to bug 640118