Title: [89537] trunk/Source/WebKit2
- Revision
- 89537
- Author
- carlo...@webkit.org
- Date
- 2011-06-22 23:44:36 -0700 (Wed, 22 Jun 2011)
Log Message
2011-06-22 Carlos Garcia Campos <cgar...@igalia.com>
Reviewed by Martin Robinson.
[UNIX] Check for npp directly when getting X display in NetscapeBrowserFuncs
https://bugs.webkit.org/show_bug.cgi?id=63149
NetscapePlugin::fromNPP() shouldn't be called with a null npp, it
contains an assert that make it crash when building with debug enabled.
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::NPN_GetValue):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (89536 => 89537)
--- trunk/Source/WebKit2/ChangeLog 2011-06-23 06:31:46 UTC (rev 89536)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-23 06:44:36 UTC (rev 89537)
@@ -1,3 +1,16 @@
+2011-06-22 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [UNIX] Check for npp directly when getting X display in NetscapeBrowserFuncs
+ https://bugs.webkit.org/show_bug.cgi?id=63149
+
+ NetscapePlugin::fromNPP() shouldn't be called with a null npp, it
+ contains an assert that make it crash when building with debug enabled.
+
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::NPN_GetValue):
+
2011-06-22 Nate Chapin <jap...@chromium.org>
Reviewed by Adam Barth.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (89536 => 89537)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2011-06-23 06:31:46 UTC (rev 89536)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2011-06-23 06:44:36 UTC (rev 89537)
@@ -504,8 +504,7 @@
break;
#elif PLUGIN_ARCHITECTURE(X11)
case NPNVxDisplay: {
- RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
- if (!plugin)
+ if (!npp)
return NPERR_GENERIC_ERROR;
#if PLATFORM(QT)
*reinterpret_cast<Display**>(value) = QX11Info::display();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
