Changeset 86848 in webkit

Timestamp:

May 19, 2011 9:51:09 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

2011-05-19 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Anders Carlsson.

Fix build with ENABLE_PLUGIN_PROCESS=1 for non-mac platforms after r86578
​https://bugs.webkit.org/show_bug.cgi?id=61113

• PluginProcess/PluginControllerProxy.cpp: (WebKit::PluginControllerProxy::tryToShortCircuitInvoke): (WebKit::PluginControllerProxy::tryToShortCircuitEvaluate):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginControllerProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Anders Carlsson.
+
+        Fix build with ENABLE_PLUGIN_PROCESS=1 for non-mac platforms after r86578
+        https://bugs.webkit.org/show_bug.cgi?id=61113
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::tryToShortCircuitInvoke):
+        (WebKit::PluginControllerProxy::tryToShortCircuitEvaluate):
+
 2011-05-19  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -291 +291 @@
 {
     // Only try to short circuit evaluate for plug-ins that have the quirk specified.
+#if PLUGIN_ARCHITECTURE(MAC)
     if (!PluginProcess::shared().netscapePluginModule()->pluginQuirks().contains(PluginQuirks::CanShortCircuitSomeNPRuntimeCallsDuringInitialization))
         return false;
-    
+#else
+    return false;
+#endif
+
     // And only when we're in initialize.
     if (!inInitialize())
@@ -590 +594 @@
 {
     // Only try to short circuit evaluate for plug-ins that have the quirk specified.
+#if PLUGIN_ARCHITECTURE(MAC)
     if (!PluginProcess::shared().netscapePluginModule()->pluginQuirks().contains(PluginQuirks::CanShortCircuitSomeNPRuntimeCallsDuringInitialization))
         return false;
+#else
+    return false;
+#endif
 
     // And only when we're in initialize.