[chromium] Don't include internal GTK headers so we build with GTK_DISABLE_SINGLE_INC...

https://bugs.webkit.org/show_bug.cgi?id=72653

Patch by Elliot Glaysher <erg@chromium.org> on 2011-11-17
Reviewed by James Robinson.

* src/gtk/WebInputEventFactory.cpp:
(WebKit::gdkStateToWebEventModifiers): Remove a
GTK_CHECK_VERSION that will always be true, as the oldest
libgtk we support is 2.18.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@100704 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 93007e7889e4aef83523cd37a603d0bf5416c1de..06f8c24234ef3021966a995806425de50dac0cd5 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2011-11-17  Elliot Glaysher  <erg@chromium.org>
+
+        [chromium] Don't include internal GTK headers so we build with GTK_DISABLE_SINGLE_INCLUDES
+
+        https://bugs.webkit.org/show_bug.cgi?id=72653
+
+        Reviewed by James Robinson.
+
+        * src/gtk/WebInputEventFactory.cpp:
+        (WebKit::gdkStateToWebEventModifiers): Remove a
+        GTK_CHECK_VERSION that will always be true, as the oldest
+        libgtk we support is 2.18.
+
+
 2011-11-17  David Reveman  <reveman@chromium.org>
 
         [Chromium] Calls to paintContentsIfDirty() and updateCompositorResources() should be balanced.

diff --git a/Source/WebKit/chromium/src/gtk/WebInputEventFactory.cpp b/Source/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
index 4e355d2d277c25680b2e83dd093bf9a942ebef0b..b82ea52b3fcd9cc506bfa2cbba97bf305b6f89ad 100644 (file)
--- a/Source/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
+++ b/Source/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
@@ -39,7 +39,6 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkversion.h>
 
 #include <wtf/Assertions.h>
 
@@ -99,10 +98,8 @@ static int gdkStateToWebEventModifiers(guint state)
         modifiers |= WebInputEvent::ControlKey;
     if (state & GDK_MOD1_MASK)
         modifiers |= WebInputEvent::AltKey;
-#if GTK_CHECK_VERSION(2, 10, 0)
     if (state & GDK_META_MASK)
         modifiers |= WebInputEvent::MetaKey;
-#endif
     if (state & GDK_BUTTON1_MASK)
         modifiers |= WebInputEvent::LeftButtonDown;
     if (state & GDK_BUTTON2_MASK)