[Qt][X11] Fix build with V8 against X11 headers.
Reviewed by Andreas Kling.
Added "True" and "False" to the list of words
we free from the X11 macro jail.
* bridge/npruntime_internal.h:
* config.h: The V8 bindings end up indirectly pulling
in X11 headers and they use True/False. There's no
central header apart from this one, so include the
x11 fixing header here for Qt/X11/V8.
* plugins/qt/PluginViewQt.cpp:
(WebCore::PluginView::paint): Use false instead of False
since False isn't available anymore.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67323 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index abbfb40..99d4e1e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,24 @@
Reviewed by Andreas Kling.
+ [Qt][X11] Fix build with V8 against X11 headers.
+
+ Added "True" and "False" to the list of words
+ we free from the X11 macro jail.
+
+ * bridge/npruntime_internal.h:
+ * config.h: The V8 bindings end up indirectly pulling
+ in X11 headers and they use True/False. There's no
+ central header apart from this one, so include the
+ x11 fixing header here for Qt/X11/V8.
+ * plugins/qt/PluginViewQt.cpp:
+ (WebCore::PluginView::paint): Use false instead of False
+ since False isn't available anymore.
+
+2010-09-12 Simon Hausmann <simon.hausmann@nokia.com>
+
+ Reviewed by Andreas Kling.
+
[Qt] Fix compilation with V8 and Qt.
Use WebKit's page cache for ScriptCachedFrameData.
diff --git a/WebCore/bridge/npruntime_internal.h b/WebCore/bridge/npruntime_internal.h
index 736a7f1..550c34c 100644
--- a/WebCore/bridge/npruntime_internal.h
+++ b/WebCore/bridge/npruntime_internal.h
@@ -48,4 +48,6 @@
#undef FontChange
#undef GrayScale
#undef NormalState
+ #undef True
+ #undef False
#endif
diff --git a/WebCore/config.h b/WebCore/config.h
index 22e997b..ad0767c 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -214,3 +214,8 @@
#define WTF_USE_SAFARI_THEME 1
#endif
+#if PLATFORM(QT) && USE(V8) && defined(Q_WS_X11)
+/* protect ourselves from evil X11 defines */
+#include <bridge/npruntime_internal.h>
+#endif
+
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index e2df392..f810ea00 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -322,7 +322,7 @@
dispatchNPEvent(xevent);
if (syncX)
- XSync(m_pluginDisplay, False); // sync changes by plugin
+ XSync(m_pluginDisplay, false); // sync changes by plugin
painter->drawPixmap(QPoint(frameRect().x() + exposedRect.x(), frameRect().y() + exposedRect.y()), qtDrawable,
exposedRect);
