Title: [88171] trunk/Source/WebKit2
- Revision
- 88171
- Author
- [email protected]
- Date
- 2011-06-06 10:10:16 -0700 (Mon, 06 Jun 2011)
Log Message
2011-06-06 Carlos Garcia Campos <[email protected]>
Reviewed by Anders Carlsson.
Do not use NPRuntimeObjectMap in NetscapePlugin::setException when plug-in is running out of process
https://bugs.webkit.org/show_bug.cgi?id=62124
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::setException):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88170 => 88171)
--- trunk/Source/WebKit2/ChangeLog 2011-06-06 16:48:07 UTC (rev 88170)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-06 17:10:16 UTC (rev 88171)
@@ -1,3 +1,13 @@
+2011-06-06 Carlos Garcia Campos <[email protected]>
+
+ Reviewed by Anders Carlsson.
+
+ Do not use NPRuntimeObjectMap in NetscapePlugin::setException when plug-in is running out of process
+ https://bugs.webkit.org/show_bug.cgi?id=62124
+
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::setException):
+
2011-06-06 Dominic Cooney <[email protected]>
Unreviewed WinCairo build fix after r88159.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (88170 => 88171)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-06-06 16:48:07 UTC (rev 88170)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-06-06 17:10:16 UTC (rev 88171)
@@ -213,9 +213,12 @@
void NetscapePlugin::setException(const String& exceptionString)
{
+#if ENABLE(PLUGIN_PROCESS)
// FIXME: If the plug-in is running in its own process, this needs to send a CoreIPC message instead of
// calling the runtime object map directly.
+#else
NPRuntimeObjectMap::setGlobalException(exceptionString);
+#endif
}
bool NetscapePlugin::evaluate(NPObject* npObject, const String& scriptString, NPVariant* result)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
