Changeset 73387 in webkit

Timestamp:

Dec 6, 2010 12:34:47 PM (13 years ago)

Author:

andersca@apple.com

Message:

Add a shim for IsWindowActive
​https://bugs.webkit.org/show_bug.cgi?id=50582

Reviewed by Adam Roben.

• PluginProcess/mac/PluginProcessMac.mm:

(WebKit::isWindowActive):
Get the NetscapePlugin from the WindowRef and check if the plug-in's window is active.

(WebKit::PluginProcess::initializeShim):

• PluginProcess/mac/PluginProcessShim.cpp

(WebKit::shimIsWindowActive):
Call isWindowActive. If it returns true, return the result value. Otherwise, call the real
IsWindowActive function.

• PluginProcess/mac/PluginProcessShim.h:
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::NetscapePlugin):
Initialize m_isWindowactive.

• WebProcess/Plugins/Netscape/NetscapePlugin.h:

(WebKit::NetscapePlugin::isWindowActive):
Return whether the window is active.

• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:

(WebKit::windowMap):
(WebKit::NetscapePlugin::platformPostInitialize):
(WebKit::NetscapePlugin::platformDestroy):
(WebKit::NetscapePlugin::netscapePluginFromWindow):
Add a mapping between windows and the corresponding NetscapePlugin objects.

(WebKit::NetscapePlugin::windowFocusChanged):
Update the window focus member variable.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/mac/PluginProcessMac.mm (modified) (2 diffs)
• PluginProcess/mac/PluginProcessShim.cpp (modified) (1 diff)
• PluginProcess/mac/PluginProcessShim.h (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (2 diffs)
• WebProcess/Plugins/Netscape/NetscapePlugin.h (modified) (2 diffs)
• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (modified) (6 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-06  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Add a shim for IsWindowActive
+        https://bugs.webkit.org/show_bug.cgi?id=50582
+
+        * PluginProcess/mac/PluginProcessMac.mm:
+        (WebKit::isWindowActive):
+        Get the NetscapePlugin from the WindowRef and check if the plug-in's window is active.
+
+        (WebKit::PluginProcess::initializeShim):
+        * PluginProcess/mac/PluginProcessShim.cpp        
+        (WebKit::shimIsWindowActive):
+        Call isWindowActive. If it returns true, return the result value. Otherwise, call the real
+        IsWindowActive function.
+
+        * PluginProcess/mac/PluginProcessShim.h:
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::NetscapePlugin):
+        Initialize m_isWindowactive.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+        (WebKit::NetscapePlugin::isWindowActive):
+        Return whether the window is active.
+
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        (WebKit::windowMap):
+        (WebKit::NetscapePlugin::platformPostInitialize):
+        (WebKit::NetscapePlugin::platformDestroy):
+        (WebKit::NetscapePlugin::netscapePluginFromWindow):
+        Add a mapping between windows and the corresponding NetscapePlugin objects.
+
+        (WebKit::NetscapePlugin::windowFocusChanged):
+        Update the window focus member variable.
+
 2010-12-06  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/PluginProcess/mac/PluginProcessMac.mm

@@ -28 +28 @@
 #include "PluginProcess.h"
 
+#include "NetscapePlugin.h"
 #include "PluginProcessShim.h"
 #include <dlfcn.h>
@@ -50 +51 @@
     return isUserbreakSet;
 }
-    
+
+static bool isWindowActive(WindowRef windowRef, bool& result)
+{
+#ifndef NP_NO_CARBON
+    if (NetscapePlugin* plugin = NetscapePlugin::netscapePluginFromWindow(windowRef)) {
+        result = plugin->isWindowActive();
+        return true;
+    }
+#endif
+    return false;
+}
+
 void PluginProcess::initializeShim()
 {
     const PluginProcessShimCallbacks callbacks = {
         shouldCallRealDebugger,
+        isWindowActive,
     };
 

trunk/WebKit2/PluginProcess/mac/PluginProcessShim.cpp

@@ -54 +54 @@
 }
 
+static Boolean shimIsWindowActive(WindowRef window)
+{
+    bool result;
+    if (pluginProcessShimCallbacks.isWindowActive(window, result))
+        return result;
+    
+    return IsWindowActive(window);
+}
+    
 DYLD_INTERPOSE(shimDebugger, Debugger);
+DYLD_INTERPOSE(shimIsWindowActive, IsWindowActive);
+    
 #endif
 

trunk/WebKit2/PluginProcess/mac/PluginProcessShim.h

@@ -27 +27 @@
 #define PluginProcessShim_h
 
+#include <Carbon/Carbon.h>
+
 namespace WebKit {
 
 struct PluginProcessShimCallbacks {
     bool (*shouldCallRealDebugger)();
+    bool (*isWindowActive)(WindowRef, bool& result);
 };
 

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -43 +43 @@
 // The plug-in that we're currently calling NPP_New for.
 static NetscapePlugin* currentNPPNewPlugin;
-    
+
 NetscapePlugin::NetscapePlugin(PassRefPtr<NetscapePluginModule> pluginModule)
     : m_pluginController(0)
@@ -63 +63 @@
     , m_nullEventTimer(RunLoop::main(), this, &NetscapePlugin::nullEventTimerFired)
     , m_npCGContext()
+    , m_isWindowActive(false)
 #endif    
 #endif

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

@@ -59 +59 @@
 #ifndef NP_NO_CARBON
     WindowRef windowRef() const;
+    bool isWindowActive() const { return m_isWindowActive; }
+
+    static NetscapePlugin* netscapePluginFromWindow(WindowRef);
 #endif
 #elif PLATFORM(WIN)
@@ -201 +204 @@
     RunLoop::Timer<NetscapePlugin> m_nullEventTimer;
     NP_CGContext m_npCGContext;
+    bool m_isWindowActive;
 #endif
 #elif PLATFORM(WIN)

trunk/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm

@@ -33 +33 @@
 namespace WebKit {
 
-#ifndef NP_NO_QUICKDRAW
+#ifndef NP_NO_CARBON
 static const double nullEventIntervalActive = 0.02;
 static const double nullEventIntervalNotActive = 0.25;
@@ -80 +80 @@
     return NPERR_NO_ERROR;
 }
+
+#ifndef NP_NO_CARBON
+typedef HashMap<WindowRef, NetscapePlugin*> WindowMap;
+
+static WindowMap& windowMap()
+{
+    DEFINE_STATIC_LOCAL(WindowMap, windowMap, ());
+
+    return windowMap;
+}
+#endif
 
 bool NetscapePlugin::platformPostInitialize()
@@ -138 +149 @@
         m_npWindow.window = &m_npCGContext;
 
+        ASSERT(!windowMap().contains(windowRef()));
+        windowMap().set(windowRef(), this);
+
         // Start the null event timer.
         // FIXME: Throttle null events when the plug-in isn't visible on screen.
@@ -155 +169 @@
             DisposeWindow(static_cast<WindowRef>(m_npCGContext.window));
 
+        ASSERT(windowMap().contains(windowRef()));
+        windowMap().remove(windowRef());
+
         // Stop the null event timer.
         m_nullEventTimer.stop();
@@ -181 +198 @@
 
 #ifndef NP_NO_CARBON
+NetscapePlugin* NetscapePlugin::netscapePluginFromWindow(WindowRef windowRef)
+{
+    return windowMap().get(windowRef);
+}
+
 WindowRef NetscapePlugin::windowRef() const
 {
@@ -603 +625 @@
 #ifndef NP_NO_CARBON
         case NPEventModelCarbon: {
+            m_isWindowActive = hasFocus;
+            
             HiliteWindow(windowRef(), hasFocus);
             if (hasFocus)