Title: [149669] trunk/Source/WebCore
- Revision
- 149669
- Author
- commit-qu...@webkit.org
- Date
- 2013-05-07 08:07:46 -0700 (Tue, 07 May 2013)
Log Message
[X11][BlackBerry] Check if MOZ_X11 is defined instead of XP_UNIX npruntime_internal.h
https://bugs.webkit.org/show_bug.cgi?id=113687
Patch by Carlos Garcia Campos <cgar...@igalia.com> on 2013-05-07
Reviewed by Anders Carlsson.
It's assumed that all UNIX platforms use X11 for plugins, which is
not the case of BlackBerry.
* bridge/npruntime_internal.h: Use MOZ_X11 instead of XP_UNIX.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149668 => 149669)
--- trunk/Source/WebCore/ChangeLog 2013-05-07 14:41:50 UTC (rev 149668)
+++ trunk/Source/WebCore/ChangeLog 2013-05-07 15:07:46 UTC (rev 149669)
@@ -1,3 +1,15 @@
+2013-05-07 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [X11][BlackBerry] Check if MOZ_X11 is defined instead of XP_UNIX npruntime_internal.h
+ https://bugs.webkit.org/show_bug.cgi?id=113687
+
+ Reviewed by Anders Carlsson.
+
+ It's assumed that all UNIX platforms use X11 for plugins, which is
+ not the case of BlackBerry.
+
+ * bridge/npruntime_internal.h: Use MOZ_X11 instead of XP_UNIX.
+
2013-05-07 Mikhail Pozdnyakov <mikhail.pozdnya...@intel.com>
HashTraits<RefPtr<P> >::PeekType should be raw pointer for better performance
Modified: trunk/Source/WebCore/bridge/npruntime_internal.h (149668 => 149669)
--- trunk/Source/WebCore/bridge/npruntime_internal.h 2013-05-07 14:41:50 UTC (rev 149668)
+++ trunk/Source/WebCore/bridge/npruntime_internal.h 2013-05-07 15:07:46 UTC (rev 149669)
@@ -29,7 +29,7 @@
#include "npfunctions.h"
#include "npruntime.h"
-#ifdef XP_UNIX
+#if defined(MOZ_X11)
#include <X11/Xresource.h>
#undef None
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
