[webkit-changes] [111955] releases/WebKitGTK/webkit-1.8/Source/WebCore

[mrobinson]

Title: [111955] releases/WebKitGTK/webkit-1.8/Source/WebCore

Revision

111955

Author

mrobin...@webkit.org

Date

2012-03-23 18:07:10 -0700 (Fri, 23 Mar 2012)

Log Message

Merging r110178.diff

Modified Paths

releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp

Diff

Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (111954 => 111955)

--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog	2012-03-24 01:06:19 UTC (rev 111954)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog	2012-03-24 01:07:10 UTC (rev 111955)
@@ -1,3 +1,13 @@
+2012-03-23  Mikkel Kruse Johnsen  <mik...@linet.dk>
+
+        WebKitGtk+ fails to build on win32 against GTK3
+        https://bugs.webkit.org/show_bug.cgi?id=63919
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * plugins/gtk/PluginViewGtk.cpp: Don't use gtk_socket_new with GTK3 on Win32
+        (WebCore::PluginView::platformStart):
+
 2012-03-23  Dan Bernstein  <m...@apple.com>
 
         <rdar://problem/10923294> REGRESSION (r100847): Entries are clipped out in Day One

Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp (111954 => 111955)

--- releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp	2012-03-24 01:06:19 UTC (rev 111954)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/plugins/gtk/PluginViewGtk.cpp	2012-03-24 01:07:10 UTC (rev 111955)
@@ -884,7 +884,11 @@
         } else
             setPlatformWidget(gtk_xtbin_new(pageClient, 0));
 #else
+#if OS(WINDOWS) && !defined(GTK_API_VERSION_2)
+        setPlatformWidget(0);
+#else
         setPlatformWidget(gtk_socket_new());
+#endif
         gtk_container_add(GTK_CONTAINER(pageClient), platformPluginWidget());
 #endif
     } else {

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes