Title: [86848] trunk/Source/WebKit2
- Revision
- 86848
- Author
- [email protected]
- Date
- 2011-05-19 09:51:09 -0700 (Thu, 19 May 2011)
Log Message
2011-05-19 Carlos Garcia Campos <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (86847 => 86848)
--- trunk/Source/WebKit2/ChangeLog 2011-05-19 16:33:32 UTC (rev 86847)
+++ trunk/Source/WebKit2/ChangeLog 2011-05-19 16:51:09 UTC (rev 86848)
@@ -1,3 +1,14 @@
+2011-05-19 Carlos Garcia Campos <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, follow-up fix of the messages python unittests after r86812.
Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (86847 => 86848)
--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-05-19 16:33:32 UTC (rev 86847)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-05-19 16:51:09 UTC (rev 86848)
@@ -290,9 +290,13 @@
bool PluginControllerProxy::tryToShortCircuitInvoke(NPObject* npObject, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, bool& returnValue, NPVariant& result)
{
// 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())
return false;
@@ -589,8 +593,12 @@
bool PluginControllerProxy::tryToShortCircuitEvaluate(NPObject* npObject, const String& scriptString, NPVariant* result)
{
// 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())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
