- Revision
- 128236
- Author
- [email protected]
- Date
- 2012-09-11 16:17:20 -0700 (Tue, 11 Sep 2012)
Log Message
Get rid of the PluginProcessShim for 64-bit plug-ins
<rdar://problem/12068560> and https://bugs.webkit.org/show_bug.cgi?id=96415
Reviewed by Anders Carlsson.
* PluginProcess/PluginProcess.h:
(PluginProcess):
* PluginProcess/mac/PluginProcessMac.mm:
(WebKit::getCurrentEventButtonState):
(WebKit):
(WebKit::beginModal): Moved from the shim, to be shared with shimmed processes.
(WebKit::endModal): Ditto.
(WebKit::replacedRunModalForWindow): Only used by Cocoa overrides.
(WebKit::PluginProcess::initializeShim):
(WebKit::PluginProcess::initializeCocoaOverrides):
* PluginProcess/mac/PluginProcessMainMac.mm:
(WebKit::PluginProcessMain): Only call initializeShim for 32-bit processes, always call initializeCocoaOverrides
* PluginProcess/mac/PluginProcessShim.h:
(PluginProcessShimCallbacks):
* PluginProcess/mac/PluginProcessShim.mm:
(WebKit):
(WebKit::shimModalDialog): Call beginModal/endModal from the shim callbacks.
(WebKit::shimAlert): Ditto.
(WebKit::WebKitPluginProcessShimInitialize): Don't do the Cocoa overrides as they are now handled outside the shim.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128235 => 128236)
--- trunk/Source/WebKit2/ChangeLog 2012-09-11 23:08:57 UTC (rev 128235)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-11 23:17:20 UTC (rev 128236)
@@ -1,3 +1,33 @@
+2012-09-11 Brady Eidson <[email protected]>
+
+ Get rid of the PluginProcessShim for 64-bit plug-ins
+ <rdar://problem/12068560> and https://bugs.webkit.org/show_bug.cgi?id=96415
+
+ Reviewed by Anders Carlsson.
+
+ * PluginProcess/PluginProcess.h:
+ (PluginProcess):
+
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::getCurrentEventButtonState):
+ (WebKit):
+ (WebKit::beginModal): Moved from the shim, to be shared with shimmed processes.
+ (WebKit::endModal): Ditto.
+ (WebKit::replacedRunModalForWindow): Only used by Cocoa overrides.
+ (WebKit::PluginProcess::initializeShim):
+ (WebKit::PluginProcess::initializeCocoaOverrides):
+
+ * PluginProcess/mac/PluginProcessMainMac.mm:
+ (WebKit::PluginProcessMain): Only call initializeShim for 32-bit processes, always call initializeCocoaOverrides
+
+ * PluginProcess/mac/PluginProcessShim.h:
+ (PluginProcessShimCallbacks):
+ * PluginProcess/mac/PluginProcessShim.mm:
+ (WebKit):
+ (WebKit::shimModalDialog): Call beginModal/endModal from the shim callbacks.
+ (WebKit::shimAlert): Ditto.
+ (WebKit::WebKitPluginProcessShimInitialize): Don't do the Cocoa overrides as they are now handled outside the shim.
+
2012-09-11 Marcelo Lira <[email protected]>
Restore original value of mock scrollbars enabled in InternalSettings
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (128235 => 128236)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2012-09-11 23:08:57 UTC (rev 128235)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2012-09-11 23:17:20 UTC (rev 128236)
@@ -56,6 +56,7 @@
#if PLATFORM(MAC)
void initializeShim();
+ void initializeCocoaOverrides();
void setModalWindowIsShowing(bool);
void setFullscreenWindowIsShowing(bool);
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (128235 => 128236)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2012-09-11 23:08:57 UTC (rev 128235)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2012-09-11 23:17:20 UTC (rev 128236)
@@ -36,6 +36,7 @@
#import <WebCore/LocalizedStrings.h>
#import <WebKitSystemInterface.h>
#import <dlfcn.h>
+#import <objc/runtime.h>
#import <wtf/HashSet.h>
namespace WebKit {
@@ -160,17 +161,7 @@
return 0;
#endif
}
-
-static void cocoaWindowShown(NSWindow *window)
-{
- fullscreenWindowTracker().windowShown(window);
-}
-static void cocoaWindowHidden(NSWindow *window)
-{
- fullscreenWindowTracker().windowHidden(window);
-}
-
static void carbonWindowShown(WindowRef window)
{
#ifndef NP_NO_CARBON
@@ -190,14 +181,44 @@
PluginProcess::shared().setModalWindowIsShowing(modalWindowIsShowing);
}
+static unsigned modalCount = 0;
+
+static void beginModal()
+{
+ // Make sure to make ourselves the front process
+ ProcessSerialNumber psn;
+ GetCurrentProcess(&psn);
+ SetFrontProcess(&psn);
+
+ if (!modalCount++)
+ setModal(true);
+}
+
+static void endModal()
+{
+ if (!--modalCount)
+ setModal(false);
+}
+
+static IMP NSApplication_RunModalForWindow;
+
+static NSInteger replacedRunModalForWindow(id self, SEL _cmd, NSWindow* window)
+{
+ beginModal();
+ NSInteger result = ((NSInteger (*)(id, SEL, NSWindow *))NSApplication_RunModalForWindow)(self, _cmd, window);
+ endModal();
+
+ return result;
+}
+
void PluginProcess::initializeShim()
{
const PluginProcessShimCallbacks callbacks = {
shouldCallRealDebugger,
isWindowActive,
getCurrentEventButtonState,
- cocoaWindowShown,
- cocoaWindowHidden,
+ beginModal,
+ endModal,
carbonWindowShown,
carbonWindowHidden,
setModal,
@@ -207,6 +228,30 @@
initFunc(callbacks);
}
+void PluginProcess::initializeCocoaOverrides()
+{
+ // Override -[NSApplication runModalForWindow:]
+ Method runModalForWindowMethod = class_getInstanceMethod(objc_getClass("NSApplication"), @selector(runModalForWindow:));
+ NSApplication_RunModalForWindow = method_setImplementation(runModalForWindowMethod, reinterpret_cast<IMP>(replacedRunModalForWindow));
+
+ NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
+
+ // Track when any Cocoa window is about to be be shown.
+ id orderOnScreenObserver = [defaultCenter addObserverForName:WKWindowWillOrderOnScreenNotification()
+ object:nil
+ queue:nil
+ usingBlock:^(NSNotification *notification) { fullscreenWindowTracker().windowShown([notification object]); }];
+ // Track when any Cocoa window is about to be hidden.
+ id orderOffScreenObserver = [defaultCenter addObserverForName:WKWindowWillOrderOffScreenNotification()
+ object:nil
+ queue:nil
+ usingBlock:^(NSNotification *notification) { fullscreenWindowTracker().windowHidden([notification object]); }];
+
+ // Leak the two observers so that they observe notifications for the lifetime of the process.
+ CFRetain(orderOnScreenObserver);
+ CFRetain(orderOffScreenObserver);
+}
+
void PluginProcess::setModalWindowIsShowing(bool modalWindowIsShowing)
{
m_connection->send(Messages::PluginProcessProxy::SetModalWindowIsShowing(modalWindowIsShowing), 0);
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm (128235 => 128236)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm 2012-09-11 23:08:57 UTC (rev 128235)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm 2012-09-11 23:17:20 UTC (rev 128236)
@@ -116,9 +116,14 @@
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
- // Initialize the shim.
+#if defined(__i386__)
+ // Initialize the shim for 32-bit only.
PluginProcess::shared().initializeShim();
+#endif
+ // Initialize Cocoa overrides.
+ PluginProcess::shared().initializeCocoaOverrides();
+
// Initialize the plug-in process connection.
PluginProcess::shared().initialize(CoreIPC::Connection::Identifier(serverPort), RunLoop::main());
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.h (128235 => 128236)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.h 2012-09-11 23:08:57 UTC (rev 128235)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.h 2012-09-11 23:17:20 UTC (rev 128236)
@@ -36,8 +36,8 @@
bool (*shouldCallRealDebugger)();
bool (*isWindowActive)(WindowRef, bool& result);
UInt32 (*getCurrentEventButtonState)();
- void (*cocoaWindowShown)(NSWindow *);
- void (*cocoaWindowHidden)(NSWindow *);
+ void (*beginModal)();
+ void (*endModal)();
void (*carbonWindowShown)(WindowRef);
void (*carbonWindowHidden)(WindowRef);
void (*setModal)(bool);
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm (128235 => 128236)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm 2012-09-11 23:08:57 UTC (rev 128235)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm 2012-09-11 23:17:20 UTC (rev 128236)
@@ -42,35 +42,6 @@
static PluginProcessShimCallbacks pluginProcessShimCallbacks;
-static IMP NSApplication_RunModalForWindow;
-static unsigned modalCount = 0;
-
-static void beginModal()
-{
- // Make sure to make ourselves the front process
- ProcessSerialNumber psn;
- GetCurrentProcess(&psn);
- SetFrontProcess(&psn);
-
- if (!modalCount++)
- pluginProcessShimCallbacks.setModal(true);
-}
-
-static void endModal()
-{
- if (!--modalCount)
- pluginProcessShimCallbacks.setModal(false);
-}
-
-static NSInteger shim_NSApplication_RunModalForWindow(id self, SEL _cmd, NSWindow* window)
-{
- beginModal();
- NSInteger result = ((NSInteger (*)(id, SEL, NSWindow *))NSApplication_RunModalForWindow)(self, _cmd, window);
- endModal();
-
- return result;
-}
-
#ifndef __LP64__
#if COMPILER(CLANG)
@@ -102,16 +73,16 @@
static void shimModalDialog(ModalFilterUPP modalFilter, DialogItemIndex *itemHit)
{
- beginModal();
+ pluginProcessShimCallbacks.beginModal();
ModalDialog(modalFilter, itemHit);
- endModal();
+ pluginProcessShimCallbacks.endModal();
}
static DialogItemIndex shimAlert(SInt16 alertID, ModalFilterUPP modalFilter)
{
- beginModal();
+ pluginProcessShimCallbacks.beginModal();
DialogItemIndex index = Alert(alertID, modalFilter);
- endModal();
+ pluginProcessShimCallbacks.endModal();
return index;
}
@@ -146,27 +117,6 @@
void WebKitPluginProcessShimInitialize(const PluginProcessShimCallbacks& callbacks)
{
pluginProcessShimCallbacks = callbacks;
-
- // Override -[NSApplication runModalForWindow:]
- Method runModalForWindowMethod = class_getInstanceMethod(objc_getClass("NSApplication"), @selector(runModalForWindow:));
- NSApplication_RunModalForWindow = method_setImplementation(runModalForWindowMethod, reinterpret_cast<IMP>(shim_NSApplication_RunModalForWindow));
-
- NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
-
- // Track when any Cocoa window is about to be be shown.
- id orderOnScreenObserver = [defaultCenter addObserverForName:WKWindowWillOrderOnScreenNotification()
- object:nil
- queue:nil
- usingBlock:^(NSNotification *notification) { pluginProcessShimCallbacks.cocoaWindowShown([notification object]); }];
- // Track when any cocoa window is about to be hidden.
- id orderOffScreenObserver = [defaultCenter addObserverForName:WKWindowWillOrderOffScreenNotification()
- object:nil
- queue:nil
- usingBlock:^(NSNotification *notification) { pluginProcessShimCallbacks.cocoaWindowHidden([notification object]); }];
-
- // Leak the two observers so that they observe notifications for the lifetime of the process.
- CFRetain(orderOnScreenObserver);
- CFRetain(orderOffScreenObserver);
}
} // namespace WebKit
