Replace pinch scrollbars with regular scrollbars.

Source/core/frame/VisualViewport.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 30 matching lines @@
 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "platform/TraceEvent.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/GraphicsLayerFactory.h"
-#include "platform/scroll/Scrollbar.h"
-#include "platform/scroll/ScrollbarTheme.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebLayerTreeView.h"
-#include "public/platform/WebScrollbar.h"
-#include "public/platform/WebScrollbarLayer.h"
 
 using blink::WebLayer;
 using blink::WebLayerTreeView;
-using blink::WebScrollbar;
-using blink::WebScrollbarLayer;
 using blink::FrameHost;
 using blink::GraphicsLayer;
 using blink::GraphicsLayerFactory;
 
 namespace blink {
 
 VisualViewport::VisualViewport(FrameHost& owner)
     : m_frameHost(&owner)
     , m_scale(1)
     , m_topControlsAdjustment(0)
@@ skipping 23 matching lines @@
     bool autosizerNeedsUpdating =
         (size.width() != m_size.width())
         && mainFrame()->settings()
         && mainFrame()->settings()->textAutosizingEnabled();
 
     TRACE_EVENT2("blink", "VisualViewport::setSize", "width", size.width(), "height", size.height());
     m_size = size;
 
     if (m_innerViewportContainerLayer) {
         m_innerViewportContainerLayer->setSize(m_size);
-
-        // Need to re-compute sizes for the overlay scrollbars.
-        setupScrollbar(WebScrollbar::Horizontal);
-        setupScrollbar(WebScrollbar::Vertical);
     }
 
     if (autosizerNeedsUpdating) {
         // This needs to happen after setting the m_size member since it'll be read in the update call.
         if (TextAutosizer* textAutosizer = mainFrame()->document()->textAutosizer())
             textAutosizer->updatePageInfoInAllFrames();
     }
 }
 
 void VisualViewport::reset()
@@ skipping 145 matching lines @@
 //
 // *rootTransformLayer
 //  +- *innerViewportContainerLayer (fixed pos container)
 //  |   +- *overscrollElasticityLayer
 //  |       +- *pageScaleLayer
 //  |           +- *innerViewportScrollLayer
 //  |               +-- overflowControlsHostLayer (root layer)
 //  |                   +-- outerViewportContainerLayer (fixed pos container) [frame container layer in DeprecatedPaintLayerCompositor]
 //  |                   |   +-- outerViewportScrollLayer [frame scroll layer in DeprecatedPaintLayerCompositor]
 //  |                   |       +-- content layers ...
-//  |                   +-- horizontal ScrollbarLayer (non-overlay)
-//  |                   +-- verticalScrollbarLayer (non-overlay)
-//  |                   +-- scroll corner (non-overlay)
-//  +- *horizontalScrollbarLayer (overlay)
-//  +- *verticalScrollbarLayer (overlay)
+//  +- horizontalScrollbarLayer
+//  +- verticalScrollbarLayer
+//  +- scroll corner (non-overlay only)
 //
 void VisualViewport::attachToLayerTree(GraphicsLayer* currentLayerTreeRoot, GraphicsLayerFactory* graphicsLayerFactory)
 {
     TRACE_EVENT1("blink", "VisualViewport::attachToLayerTree", "currentLayerTreeRoot", (bool)currentLayerTreeRoot);
     if (!currentLayerTreeRoot) {
         if (m_innerViewportScrollLayer)
             m_innerViewportScrollLayer->removeAllChildren();
         return;
     }
 
     if (currentLayerTreeRoot->parent() && currentLayerTreeRoot->parent() == m_innerViewportScrollLayer)
         return;
 
     if (!m_innerViewportScrollLayer) {
-        ASSERT(!m_overlayScrollbarHorizontal
-            && !m_overlayScrollbarVertical
-            && !m_overscrollElasticityLayer
+        ASSERT(!m_overscrollElasticityLayer
             && !m_pageScaleLayer
             && !m_innerViewportContainerLayer);
 
         // FIXME: The root transform layer should only be created on demand.
         m_rootTransformLayer = GraphicsLayer::create(graphicsLayerFactory, this);
         m_innerViewportContainerLayer = GraphicsLayer::create(graphicsLayerFactory, this);
         m_overscrollElasticityLayer = GraphicsLayer::create(graphicsLayerFactory, this);
         m_pageScaleLayer = GraphicsLayer::create(graphicsLayerFactory, this);
         m_innerViewportScrollLayer = GraphicsLayer::create(graphicsLayerFactory, this);
-        m_overlayScrollbarHorizontal = GraphicsLayer::create(graphicsLayerFactory, this);
-        m_overlayScrollbarVertical = GraphicsLayer::create(graphicsLayerFactory, this);
 
         ScrollingCoordinator* coordinator = frameHost().page().scrollingCoordinator();
         ASSERT(coordinator);
         coordinator->setLayerIsContainerForFixedPositionLayers(m_innerViewportScrollLayer.get(), true);
 
         // Set masks to bounds so the compositor doesn't clobber a manually
         // set inner viewport container layer size.
         m_innerViewportContainerLayer->setMasksToBounds(frameHost().settings().mainFrameClipsContent());
         m_innerViewportContainerLayer->setSize(m_size);
 
         m_innerViewportScrollLayer->platformLayer()->setScrollClipLayer(
             m_innerViewportContainerLayer->platformLayer());
         m_innerViewportScrollLayer->platformLayer()->setUserScrollable(true, true);
 
         m_rootTransformLayer->addChild(m_innerViewportContainerLayer.get());
         m_innerViewportContainerLayer->addChild(m_overscrollElasticityLayer.get());
         m_overscrollElasticityLayer->addChild(m_pageScaleLayer.get());
         m_pageScaleLayer->addChild(m_innerViewportScrollLayer.get());
-        m_innerViewportContainerLayer->addChild(m_overlayScrollbarHorizontal.get());
-        m_innerViewportContainerLayer->addChild(m_overlayScrollbarVertical.get());
 
         // Ensure this class is set as the scroll layer's ScrollableArea.
         coordinator->scrollableAreaScrollLayerDidChange(this);
-
-        // Setup the inner viewport overlay scrollbars.
-        setupScrollbar(WebScrollbar::Horizontal);
-        setupScrollbar(WebScrollbar::Vertical);
     }
 
     m_innerViewportScrollLayer->removeAllChildren();
     m_innerViewportScrollLayer->addChild(currentLayerTreeRoot);
 }
 
-void VisualViewport::setupScrollbar(WebScrollbar::Orientation orientation)
-{
-    bool isHorizontal = orientation == WebScrollbar::Horizontal;
-    GraphicsLayer* scrollbarGraphicsLayer = isHorizontal ?
-        m_overlayScrollbarHorizontal.get() : m_overlayScrollbarVertical.get();
-    OwnPtr<WebScrollbarLayer>& webScrollbarLayer = isHorizontal ?
-        m_webOverlayScrollbarHorizontal : m_webOverlayScrollbarVertical;
-
-    int thumbThickness = frameHost().settings().pinchOverlayScrollbarThickness();
-    int scrollbarThickness = thumbThickness;
-    int scrollbarMargin = scrollbarThickness;
-
-    // FIXME: Rather than manually creating scrollbar layers, we should create
-    // real scrollbars so we can reuse all the machinery from ScrollbarTheme.
-#if OS(ANDROID)
-    thumbThickness = ScrollbarTheme::theme()->thumbThickness(0);
-    scrollbarThickness = ScrollbarTheme::theme()->scrollbarThickness(RegularScrollbar);
-    scrollbarMargin = ScrollbarTheme::theme()->scrollbarMargin();
-#endif
-
-    if (!webScrollbarLayer) {
-        ScrollingCoordinator* coordinator = frameHost().page().scrollingCoordinator();
-        ASSERT(coordinator);
-        ScrollbarOrientation webcoreOrientation = isHorizontal ? HorizontalScrollbar : VerticalScrollbar;
-        webScrollbarLayer = coordinator->createSolidColorScrollbarLayer(webcoreOrientation, thumbThickness, scrollbarMargin, false);
-
-        webScrollbarLayer->setClipLayer(m_innerViewportContainerLayer->platformLayer());
-
-        // The compositor will control the scrollbar's visibility. Set to invisible by defualt
-        // so scrollbars don't show up in layout tests.
-        webScrollbarLayer->layer()->setOpacity(0);
-
-        scrollbarGraphicsLayer->setContentsToPlatformLayer(webScrollbarLayer->layer());
-        scrollbarGraphicsLayer->setDrawsContent(false);
-    }
-
-    int xPosition = isHorizontal ? 0 : m_innerViewportContainerLayer->size().width() - scrollbarThickness;
-    int yPosition = isHorizontal ? m_innerViewportContainerLayer->size().height() - scrollbarThickness : 0;
-    int width = isHorizontal ? m_innerViewportContainerLayer->size().width() - scrollbarThickness : scrollbarThickness;
-    int height = isHorizontal ? scrollbarThickness : m_innerViewportContainerLayer->size().height() - scrollbarThickness;
-
-    // Use the GraphicsLayer to position the scrollbars.
-    scrollbarGraphicsLayer->setPosition(IntPoint(xPosition, yPosition));
-    scrollbarGraphicsLayer->setSize(IntSize(width, height));
-    scrollbarGraphicsLayer->setContentsRect(IntRect(0, 0, width, height));
-}
-
 void VisualViewport::registerLayersWithTreeView(WebLayerTreeView* layerTreeView) const
 {
     TRACE_EVENT0("blink", "VisualViewport::registerLayersWithTreeView");
     ASSERT(layerTreeView);
 
     if (!mainFrame())
         return;
 
     ASSERT(frameHost().page().deprecatedLocalMainFrame()->contentLayoutObject());
 
     DeprecatedPaintLayerCompositor* compositor = frameHost().page().deprecatedLocalMainFrame()->contentLayoutObject()->compositor();
     // Get the outer viewport scroll layer.
     WebLayer* scrollLayer = compositor->scrollLayer() ? compositor->scrollLayer()->platformLayer() : 0;
 
-    m_webOverlayScrollbarHorizontal->setScrollLayer(scrollLayer);
-    m_webOverlayScrollbarVertical->setScrollLayer(scrollLayer);
-
     ASSERT(compositor);
     layerTreeView->registerViewportLayers(
         m_overscrollElasticityLayer->platformLayer(),
         m_pageScaleLayer->platformLayer(),
         m_innerViewportScrollLayer->platformLayer(),
         scrollLayer);
+
+    layerTreeView->setHidePinchScrollbarsNearMinScale(false);
 }
 
 void VisualViewport::clearLayersForTreeView(WebLayerTreeView* layerTreeView) const
 {
     ASSERT(layerTreeView);
 
     layerTreeView->clearViewportLayers();
 }
 
 DoubleRect VisualViewport::visibleContentRectDouble(IncludeScrollbarsInRect) const
@@ skipping 99 matching lines @@
     LocalFrame* frame = mainFrame();
 
     if (!frame || !frame->view())
         return IntSize();
 
     return frame->view()->visibleContentRect(IncludeScrollbars).size();
 }
 
 void VisualViewport::invalidateScrollbarRect(Scrollbar*, const IntRect&)
 {
-    // Do nothing. Visual scrollbars live on the compositor thread and will
-    // be updated when the viewport is synced to the CC.
 }
 
 void VisualViewport::setScrollOffset(const IntPoint& offset, ScrollType scrollType)
 {
     setScrollOffset(DoublePoint(offset), scrollType);
 }
 
 void VisualViewport::setScrollOffset(const DoublePoint& offset, ScrollType)
 {
     setLocation(toFloatPoint(offset));
 }
 
 GraphicsLayer* VisualViewport::layerForContainer() const
 {
     return m_innerViewportContainerLayer.get();
 }
 
 GraphicsLayer* VisualViewport::layerForScrolling() const
 {
     return m_innerViewportScrollLayer.get();
 }
 
 GraphicsLayer* VisualViewport::layerForHorizontalScrollbar() const
 {
-    return m_overlayScrollbarHorizontal.get();
+    return 0;
 }
 
 GraphicsLayer* VisualViewport::layerForVerticalScrollbar() const
 {
-    return m_overlayScrollbarVertical.get();
+    return 0;
 }
 
 void VisualViewport::paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip)
 {
 }
 
 LocalFrame* VisualViewport::mainFrame() const
 {
     return frameHost().page().mainFrame() && frameHost().page().mainFrame()->isLocalFrame() ? frameHost().page().deprecatedLocalMainFrame() : 0;
 }
@@ skipping 71 matching lines @@
 {
     String name;
     if (graphicsLayer == m_innerViewportContainerLayer.get()) {
         name = "Inner Viewport Container Layer";
     } else if (graphicsLayer == m_overscrollElasticityLayer.get()) {
         name =  "Overscroll Elasticity Layer";
     } else if (graphicsLayer == m_pageScaleLayer.get()) {
         name =  "Page Scale Layer";
     } else if (graphicsLayer == m_innerViewportScrollLayer.get()) {
         name =  "Inner Viewport Scroll Layer";
-    } else if (graphicsLayer == m_overlayScrollbarHorizontal.get()) {
-        name =  "Overlay Scrollbar Horizontal Layer";
-    } else if (graphicsLayer == m_overlayScrollbarVertical.get()) {
-        name =  "Overlay Scrollbar Vertical Layer";
     } else if (graphicsLayer == m_rootTransformLayer) {
         name =  "Root Transform Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink