Title: [90368] trunk/Source/WebCore
- Revision
- 90368
- Author
- [email protected]
- Date
- 2011-07-04 11:03:56 -0700 (Mon, 04 Jul 2011)
Log Message
2011-07-04 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90367 => 90368)
--- trunk/Source/WebCore/ChangeLog 2011-07-04 15:53:03 UTC (rev 90367)
+++ trunk/Source/WebCore/ChangeLog 2011-07-04 18:03:56 UTC (rev 90368)
@@ -1,3 +1,18 @@
+2011-07-04 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-07-04 Pavel Feldman <[email protected]>
Web Inspector: implement settings panel.
Modified: trunk/Source/WebCore/plugins/npapi.cpp (90367 => 90368)
--- trunk/Source/WebCore/plugins/npapi.cpp 2011-07-04 15:53:03 UTC (rev 90367)
+++ trunk/Source/WebCore/plugins/npapi.cpp 2011-07-04 18:03:56 UTC (rev 90368)
@@ -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
