Title: [94015] releases/WebKitGTK/webkit-1.4/Source/WebCore
Diff
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog (94014 => 94015)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-08-29 20:59:23 UTC (rev 94014)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-08-29 21:12:17 UTC (rev 94015)
@@ -1,5 +1,20 @@
2011-08-29 Martin Robinson <[email protected]>
+ Reviewed by Andreas Kling.
+
+ [GTK] r90148 did not apply to X11 platforms in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=63862
+
+ Correct the guard for an X11 specific piece of code. TARGET(X11) not
+ defined for the GTK+ port.
+
+ No new tests. This is covered by an existing test.
+
+ * plugins/npapi.cpp: Correct the X11 guard.
+ (NPN_InvalidateRect):
+
+2011-08-29 Martin Robinson <[email protected]>
+
Reviewed by Gustavo Noronha Silva.
[GTK] Untangle GtkAdjustments from WebCore
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/plugins/npapi.cpp (94014 => 94015)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/plugins/npapi.cpp 2011-08-29 20:59:23 UTC (rev 94014)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/plugins/npapi.cpp 2011-08-29 21:12:17 UTC (rev 94015)
@@ -122,7 +122,7 @@
void NPN_InvalidateRect(NPP instance, NPRect* invalidRect)
{
PluginView* view = pluginViewForInstance(instance);
-#if defined(TARGET_X11)
+#if defined(XP_UNIX)
// NSPluginWrapper, a plugin wrapper binary that allows running 32-bit plugins
// on 64-bit architectures typically used in X11, will sometimes give us a null NPP here.
if (!view)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
