2011-03-10 Martin Robinson <mrobinson@igalia.com>

        Reviewed by Xan Lopez.

        [GTK] [Webkit2] There are no scrollbars visible in the MiniBrowser
        https://bugs.webkit.org/show_bug.cgi?id=56125

        No new tests. This functionality will be tested once we have TestRunner
        implementation for WebKit2 with pixel dumping support.

        * GNUmakefile.am: Add a new define with tracks whether or not we are using
        our specialized GTK+ ScrollView.
        * platform/ScrollView.cpp: Only use the GTK+-specific ScrollView if we are compiling
        WebKit1.
        (WebCore::ScrollView::wheelEvent):
        * platform/gtk/ScrollViewGtk.cpp: Ditto.

git-svn-id: svn://svn.chromium.org/blink/trunk@80775 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebCore/ChangeLog

+2011-03-10  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] [Webkit2] There are no scrollbars visible in the MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=56125
+
+        No new tests. This functionality will be tested once we have TestRunner
+        implementation for WebKit2 with pixel dumping support.
+
+        * GNUmakefile.am: Add a new define with tracks whether or not we are using
+        our specialized GTK+ ScrollView.
+        * platform/ScrollView.cpp: Only use the GTK+-specific ScrollView if we are compiling
+        WebKit1.
+        (WebCore::ScrollView::wheelEvent):
+        * platform/gtk/ScrollViewGtk.cpp: Ditto.
+
 2011-03-10  Kent Tamura  <tkent@chromium.org>
 
         Reviewed by Dimitri Glazkov.

third_party/WebKit/Source/WebCore/GNUmakefile.am

@@ -3880,6 +3880,10 @@ webcoregtk_sources += \
 	Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp
 endif
 
+if !ENABLE_WEBKIT2
+FEATURE_DEFINES += WTF_USE_NATIVE_GTK_MAIN_FRAME_SCROLLBAR=1
+webcore_cppflags += -DWTF_USE_NATIVE_GTK_MAIN_FRAME_SCROLLBAR=1
+endif # END WEBKIT2
 
 # ---
 # Channel mesaging support

third_party/WebKit/Source/WebCore/platform/ScrollView.cpp

@@ -124,7 +124,7 @@ void ScrollView::setHasVerticalScrollbar(bool hasBar)
         axObjectCache()->handleScrollbarUpdate(this);
 }
 
-#if !PLATFORM(GTK)
+#if !USE(NATIVE_GTK_MAIN_FRAME_SCROLLBAR)
 PassRefPtr<Scrollbar> ScrollView::createScrollbar(ScrollbarOrientation orientation)
 {
     return Scrollbar::createNativeScrollbar(this, orientation, RegularScrollbar);
@@ -224,7 +224,7 @@ void ScrollView::setDelegatesScrolling(bool delegatesScrolling)
     m_delegatesScrolling = delegatesScrolling;
 }
 
-#if !PLATFORM(GTK)
+#if !USE(NATIVE_GTK_MAIN_FRAME_SCROLLBAR)
 IntRect ScrollView::visibleContentRect(bool includeScrollbars) const
 {
     if (platformWidget())
@@ -1167,7 +1167,7 @@ void ScrollView::setScrollOrigin(const IntPoint& origin, bool updatePositionAtAl
         updateScrollbars(scrollOffset());
 }
 
-#if !PLATFORM(WX) && !PLATFORM(GTK) && !PLATFORM(EFL)
+#if !PLATFORM(WX) && !USE(NATIVE_GTK_MAIN_FRAME_SCROLLBAR) && !PLATFORM(EFL)
 
 void ScrollView::platformInit()
 {

third_party/WebKit/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)