Changeset 177986 in webkit

Timestamp:

Jan 6, 2015, 12:43:22 PM (11 years ago)

Author:

andersca@apple.com

Message:

Reimplement NPN_PluginThreadAsyncCall without using PluginMainThreadScheduler
​https://bugs.webkit.org/show_bug.cgi?id=140140

Reviewed by Andreas Kling.

Just use a dispatch_async call to the main queue. This will let us move PluginMainThreadScheduler
out of WebCore since nobody else is using it.

• Plugins/WebNetscapePluginView.h:
• Plugins/WebNetscapePluginView.mm:

(-[WebNetscapePluginView _createPlugin]):
(-[WebNetscapePluginView _destroyPlugin]):

• Plugins/npapi.mm:

(NPN_PluginThreadAsyncCall):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Plugins/WebNetscapePluginView.h (modified) (1 diff)
• Plugins/WebNetscapePluginView.mm (modified) (3 diffs)
• Plugins/npapi.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-01-06  Anders Carlsson  <andersca@apple.com>
+
+        Reimplement NPN_PluginThreadAsyncCall without using PluginMainThreadScheduler
+        https://bugs.webkit.org/show_bug.cgi?id=140140
+
+        Reviewed by Andreas Kling.
+
+        Just use a dispatch_async call to the main queue. This will let us move PluginMainThreadScheduler
+        out of WebCore since nobody else is using it.
+
+        * Plugins/WebNetscapePluginView.h:
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView _createPlugin]):
+        (-[WebNetscapePluginView _destroyPlugin]):
+        * Plugins/npapi.mm:
+        (NPN_PluginThreadAsyncCall):
+
 2015-01-06  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.h

@@ -61 +61 @@
 @interface WebNetscapePluginView : WebBaseNetscapePluginView<WebPluginManualLoader, WebPluginContainerCheckController>
 {
+@package
     RefPtr<WebNetscapePluginStream> _manualStream;
     RetainPtr<CALayer> _pluginLayer;

trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm

@@ -66 +66 @@
 #import <WebCore/HTMLPlugInElement.h>
 #import <WebCore/Page.h> 
-#import <WebCore/PluginMainThreadScheduler.h>
 #import <WebCore/ProxyServer.h>
 #import <WebCore/ScriptController.h>
@@ -2359 +2358 @@
     ASSERT(pluginFunctionCallDepth == 0);
 
-    PluginMainThreadScheduler::scheduler().registerPlugin(plugin);
-
     _isFlash = [_pluginPackage.get() bundleIdentifier] == "com.macromedia.Flash Player.plugin";
     _isSilverlight = [_pluginPackage.get() bundleIdentifier] == "com.microsoft.SilverlightPlugin";
@@ -2375 +2372 @@
 - (void)_destroyPlugin
 {
-    PluginMainThreadScheduler::scheduler().unregisterPlugin(plugin);
-    
     if (_isSilverlight)
         [self _workaroundSilverlightFullscreenBug:NO];

trunk/Source/WebKit/mac/Plugins/npapi.mm

@@ -32 +32 @@
 #import "WebNetscapePluginView.h"
 #import "WebKitLogging.h"
-#import <WebCore/PluginMainThreadScheduler.h>
 
 using namespace WebCore;
@@ -174 +173 @@
 void NPN_PluginThreadAsyncCall(NPP instance, void (*func) (void *), void *userData)
 {
-    PluginMainThreadScheduler::scheduler().scheduleCall(instance, func, userData);
+    WebNetscapePluginView *pluginView = pluginViewForInstance(instance);
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (!pluginView || !pluginView->plugin) {
+            // The plug-in has already been destroyed.
+            return;
+        }
+
+        func(userData);
+    });
 }