Changeset 94015 in webkit

Timestamp:

Aug 29, 2011, 2:12:17 PM (15 years ago)

Author:

Martin Robinson

Message:

Merging r90368

Location:

releases/WebKitGTK/webkit-1.4/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/npapi.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Martin Robinson  <mrobinson@igalia.com>
+
+        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  <mrobinson@igalia.com>
 

releases/WebKitGTK/webkit-1.4/Source/WebCore/plugins/npapi.cpp

@@ -123 +123 @@
 {
     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.