diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/gtk/ScrollViewGtk.cpp | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/gtk/ScrollViewGtk.cpp')
-rw-r--r-- | Source/WebCore/platform/gtk/ScrollViewGtk.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebCore/platform/gtk/ScrollViewGtk.cpp b/Source/WebCore/platform/gtk/ScrollViewGtk.cpp index c5f32f3..53cacf7 100644 --- a/Source/WebCore/platform/gtk/ScrollViewGtk.cpp +++ b/Source/WebCore/platform/gtk/ScrollViewGtk.cpp @@ -31,6 +31,8 @@ #include "config.h" #include "ScrollView.h" +#if USE(NATIVE_GTK_MAIN_FRAME_SCROLLBAR) + #include "ChromeClient.h" #include "FloatRect.h" #include "Frame.h" @@ -44,7 +46,6 @@ #include "PlatformMouseEvent.h" #include "PlatformWheelEvent.h" #include "ScrollbarTheme.h" - #include <gtk/gtk.h> using namespace std; @@ -228,3 +229,5 @@ void ScrollView::setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode v } } + +#endif // USE(NATIVE_GTK_MAIN_FRAME_SCROLLBAR) |