Implement pinch-zoom scaling for main-frame scrollbars and pinch-zoom overlay scrollbars.

cc/layer_tree_host.cc

Index: cc/layer_tree_host.cc
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index 4d935dfc09daf0dbddb7d68cf9b4c81260eef378..79d4ac4ebd5271cef8c81212cc7d01ee63f68794 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -23,7 +23,11 @@
 #include "cc/math_util.h"
 #include "cc/occlusion_tracker.h"
 #include "cc/overdraw_metrics.h"
+#include "cc/pinch_zoom_scrollbar.h"
+#include "cc/pinch_zoom_scrollbar_geometry.h"
+#include "cc/pinch_zoom_scrollbar_painter.h"
 #include "cc/prioritized_resource_manager.h"
+#include "cc/scrollbar_layer.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/switches.h"
 #include "cc/thread.h"
@@ -326,6 +330,11 @@ void LayerTreeHost::finishCommitOnImplThread(LayerTreeHostImpl* hostImpl)
             syncTree->ResetContentsTexturesPurged();
     }
 
+    syncTree->SetPinchZoomHorizontalLayerId(
+        m_pinchZoomScrollbarHorizontal ? m_pinchZoomScrollbarHorizontal->id() : -1);

[enne (OOO), 2013/03/11 21:08:24]

Don't use -1 here.  Use the constant.

[wjmaclean, 2013/03/12 16:13:07]

Done.

+    syncTree->SetPinchZoomVerticalLayerId(
+        m_pinchZoomScrollbarVertical ? m_pinchZoomScrollbarVertical->id() : -1);

[enne (OOO), 2013/03/11 21:08:24]

Don't use -1 here.  Use the constant.

[wjmaclean, 2013/03/12 16:13:07]

Done.

+
     if (!m_settings.implSidePainting) {
         // If we're not in impl-side painting, the tree is immediately
         // considered active.
@@ -338,9 +347,64 @@ void LayerTreeHost::finishCommitOnImplThread(LayerTreeHostImpl* hostImpl)
     m_commitNumber++;
 }
 
+void LayerTreeHost::setPinchZoomScrollbarsBoundsAndPosition()
+{
+    if (!m_pinchZoomScrollbarHorizontal || !m_pinchZoomScrollbarVertical)
+        return;
+
+    gfx::Size size = layoutViewportSize();
+    int trackWidth = PinchZoomScrollbarGeometry::kTrackWidth;
+
+    m_pinchZoomScrollbarHorizontal->setBounds(gfx::Size(size.width() - trackWidth, trackWidth));
+    m_pinchZoomScrollbarHorizontal->setPosition(gfx::PointF(0, size.height() - trackWidth));
+
+    m_pinchZoomScrollbarVertical->setBounds(gfx::Size(trackWidth, size.height() - trackWidth));
+    m_pinchZoomScrollbarVertical->setPosition(gfx::PointF(size.width() - trackWidth, 0));
+}
+
+static scoped_refptr<ScrollbarLayer> CreatePinchZoomScrollbar(
+    WebKit::WebScrollbar::Orientation orientation, LayerTreeHost* owner)
+{
+    scoped_refptr<ScrollbarLayer> scrollbarLayer = ScrollbarLayer::create(
+        make_scoped_ptr(
+            new PinchZoomScrollbar(orientation, owner)).PassAs<WebKit::WebScrollbar>(),
+        scoped_ptr<ScrollbarThemePainter>(new PinchZoomScrollbarPainter).Pass(),
+        scoped_ptr<WebKit::WebScrollbarThemeGeometry>(
+            new PinchZoomScrollbarGeometry).Pass(),
+        Layer::s_invalidLayerId);
+        scrollbarLayer->setIsDrawable(true);
+        scrollbarLayer->setOpacity(0);
+        return scrollbarLayer;
+}
+
+void LayerTreeHost::createAndAddPinchZoomScrollbars()
+{
+    bool needsPropertiesUpdated = false;
+
+    if (!m_pinchZoomScrollbarHorizontal || !m_pinchZoomScrollbarVertical) {
+        m_pinchZoomScrollbarHorizontal = CreatePinchZoomScrollbar(WebKit::WebScrollbar::Horizontal, this);
+        m_pinchZoomScrollbarVertical = CreatePinchZoomScrollbar( WebKit::WebScrollbar::Vertical, this);
+        needsPropertiesUpdated = true;
+    }
+
+    DCHECK(m_pinchZoomScrollbarHorizontal && m_pinchZoomScrollbarVertical);
+
+    if (!m_pinchZoomScrollbarHorizontal->parent())
+        m_rootLayer->addChild(m_pinchZoomScrollbarHorizontal);
+
+    if (!m_pinchZoomScrollbarVertical->parent())
+        m_rootLayer->addChild(m_pinchZoomScrollbarVertical);
+
+    if (needsPropertiesUpdated)
+        setPinchZoomScrollbarsBoundsAndPosition();
+}
+
 void LayerTreeHost::willCommit()
 {
     m_client->willCommit();
+
+    if (m_settings.usePinchZoomScrollbars)
+        createAndAddPinchZoomScrollbars();
 }
 
 void LayerTreeHost::updateHudLayer()
@@ -501,6 +565,7 @@ void LayerTreeHost::setViewportSize(const gfx::Size& layoutViewportSize, const g
     m_layoutViewportSize = layoutViewportSize;
     m_deviceViewportSize = deviceViewportSize;
 
+    setPinchZoomScrollbarsBoundsAndPosition();
     setNeedsCommit();
 }
 
@@ -594,6 +659,11 @@ static Layer* findFirstScrollableLayer(Layer* layer)
     return 0;
 }
 
+const Layer* LayerTreeHost::rootScrollLayer() const
+{
+    return findFirstScrollableLayer(m_rootLayer.get());
+}
+
 void LayerTreeHost::updateLayers(Layer* rootLayer, ResourceUpdateQueue& queue)
 {
     TRACE_EVENT0("cc", "LayerTreeHost::updateLayers");