Title: [86870] trunk
- Revision
- 86870
- Author
- [email protected]
- Date
- 2011-05-19 11:59:30 -0700 (Thu, 19 May 2011)
Log Message
2011-05-19 Robert Hogan <[email protected]>
Reviewed by Andreas Kling.
[Qt] Fix plugins/windowless_plugin_paint_test.html
https://bugs.webkit.org/show_bug.cgi?id=60992
* platform/qt/Skipped:
2011-05-19 Robert Hogan <[email protected]>
Reviewed by Andreas Kling.
[Qt] Fix plugins/windowless_plugin_paint_test.html
https://bugs.webkit.org/show_bug.cgi?id=60992
Call gdk_init_check before gdk_display_get_default().
If we don't do this, gdk_display_get_default() will hang
the next time it's called.
* plugins/qt/PluginViewQt.cpp:
(WebCore::getPluginDisplay):
2011-05-19 Robert Hogan <[email protected]>
Reviewed by Andreas Kling.
[Qt] Fix plugins/windowless_plugin_paint_test.html
Call gdk_init_check before gdk_display_get_default().
If we don't do this, gdk_display_get_default() will hang
the next time it's called.
* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
(WebKit::getPluginDisplay):
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (86869 => 86870)
--- trunk/LayoutTests/ChangeLog 2011-05-19 18:54:23 UTC (rev 86869)
+++ trunk/LayoutTests/ChangeLog 2011-05-19 18:59:30 UTC (rev 86870)
@@ -1,3 +1,12 @@
+2011-05-19 Robert Hogan <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix plugins/windowless_plugin_paint_test.html
+ https://bugs.webkit.org/show_bug.cgi?id=60992
+
+ * platform/qt/Skipped:
+
2011-05-18 Dimitri Glazkov <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/LayoutTests/platform/qt/Skipped (86869 => 86870)
--- trunk/LayoutTests/platform/qt/Skipped 2011-05-19 18:54:23 UTC (rev 86869)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-05-19 18:59:30 UTC (rev 86870)
@@ -366,9 +366,6 @@
# headless display (like the buildbot), so XKeysymToKeycode doesn't work.
plugins/keyboard-events.html
-#Times out
-plugins/windowless_plugin_paint_test.html
-
# =========================================================================== #
# Failing Sputnik tests #
# =========================================================================== #
Modified: trunk/Source/WebCore/ChangeLog (86869 => 86870)
--- trunk/Source/WebCore/ChangeLog 2011-05-19 18:54:23 UTC (rev 86869)
+++ trunk/Source/WebCore/ChangeLog 2011-05-19 18:59:30 UTC (rev 86870)
@@ -1,3 +1,17 @@
+2011-05-19 Robert Hogan <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix plugins/windowless_plugin_paint_test.html
+ https://bugs.webkit.org/show_bug.cgi?id=60992
+
+ Call gdk_init_check before gdk_display_get_default().
+ If we don't do this, gdk_display_get_default() will hang
+ the next time it's called.
+
+ * plugins/qt/PluginViewQt.cpp:
+ (WebCore::getPluginDisplay):
+
2011-05-18 Dimitri Glazkov <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp (86869 => 86870)
--- trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp 2011-05-19 18:54:23 UTC (rev 86869)
+++ trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp 2011-05-19 18:59:30 UTC (rev 86870)
@@ -854,6 +854,11 @@
if (!library.load())
return 0;
+ typedef void *(*gdk_init_check_ptr)(void*, void*);
+ gdk_init_check_ptr gdk_init_check = (gdk_init_check_ptr)library.resolve("gdk_init_check");
+ if (!gdk_init_check)
+ return 0;
+
typedef void *(*gdk_display_get_default_ptr)();
gdk_display_get_default_ptr gdk_display_get_default = (gdk_display_get_default_ptr)library.resolve("gdk_display_get_default");
if (!gdk_display_get_default)
@@ -864,6 +869,7 @@
if (!gdk_x11_display_get_xdisplay)
return 0;
+ gdk_init_check(0, 0);
return (Display*)gdk_x11_display_get_xdisplay(gdk_display_get_default());
}
Modified: trunk/Source/WebKit2/ChangeLog (86869 => 86870)
--- trunk/Source/WebKit2/ChangeLog 2011-05-19 18:54:23 UTC (rev 86869)
+++ trunk/Source/WebKit2/ChangeLog 2011-05-19 18:59:30 UTC (rev 86870)
@@ -1,3 +1,16 @@
+2011-05-19 Robert Hogan <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix plugins/windowless_plugin_paint_test.html
+
+ Call gdk_init_check before gdk_display_get_default().
+ If we don't do this, gdk_display_get_default() will hang
+ the next time it's called.
+
+ * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+ (WebKit::getPluginDisplay):
+
2011-05-18 Chris Marrin <[email protected]>
Reviewed by Anders Carlsson.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (86869 => 86870)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2011-05-19 18:54:23 UTC (rev 86869)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2011-05-19 18:59:30 UTC (rev 86870)
@@ -61,6 +61,11 @@
if (!library.load())
return 0;
+ typedef void *(*gdk_init_check_ptr)(void*, void*);
+ gdk_init_check_ptr gdk_init_check = (gdk_init_check_ptr)library.resolve("gdk_init_check");
+ if (!gdk_init_check)
+ return 0;
+
typedef void *(*gdk_display_get_default_ptr)();
gdk_display_get_default_ptr gdk_display_get_default = (gdk_display_get_default_ptr)library.resolve("gdk_display_get_default");
if (!gdk_display_get_default)
@@ -71,6 +76,7 @@
if (!gdk_x11_display_get_xdisplay)
return 0;
+ gdk_init_check(0, 0);
return (Display*)gdk_x11_display_get_xdisplay(gdk_display_get_default());
#elif PLATFORM(GTK)
// Since we're a gdk/gtk app, we'll (probably?) have the same X connection as any gdk-based
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
