[cc] Fold more update calls into updateDrawProperties

cc/layer_tree_host_impl.h

Index: cc/layer_tree_host_impl.h
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index 79c26c02fb5ae982552c968edf152cfa2d758678..7e61e372fafba9669f55310fb69046eb13b00d71 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -52,7 +52,7 @@ public:
 // PinchZoomViewport models the bounds and offset of the viewport that is used during a pinch-zoom operation.
 // It tracks the layout-space dimensions of the viewport before any applied scale, and then tracks the layout-space
 // coordinates of the viewport respecting the pinch settings.
-class PinchZoomViewport {
+class CC_EXPORT PinchZoomViewport {
 public:
     PinchZoomViewport();
 
@@ -257,8 +257,6 @@ public:
 
     void renderingStats(RenderingStats*) const;
 
-    void updateRootScrollLayerImplTransform();
-
     void sendManagedMemoryStats(
        size_t memoryVisibleBytes,
        size_t memoryVisibleAndNearbyBytes,
@@ -303,18 +301,11 @@ public:
     template<typename RenderPassCuller>
     static void removeRenderPasses(RenderPassCuller, FrameData&);
 
+    float totalPageScaleFactorForTesting() const { return m_pinchZoomViewport.totalPageScaleFactor(); }
+
 protected:
     LayerTreeHostImpl(const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*);
 
-    void animatePageScale(base::TimeTicks monotonicTime);
-    void animateScrollbars(base::TimeTicks monotonicTime);
-
-    void updateDrawProperties();
-
-    // Exposed for testing.
-    void calculateRenderSurfaceLayerList(LayerList&);
-    void resetNeedsUpdateDrawPropertiesForTesting() { m_needsUpdateDrawProperties = false; }
-
     // Virtual for testing.
     virtual void animateLayers(base::TimeTicks monotonicTime, base::Time wallClockTime);
 
@@ -325,6 +316,11 @@ protected:
     Proxy* m_proxy;
 
 private:
+    void animatePageScale(base::TimeTicks monotonicTime);
+    void animateScrollbars(base::TimeTicks monotonicTime);
+
+    void updateDrawProperties();
+
     void computeDoubleTapZoomDeltas(ScrollAndScaleSet* scrollInfo);
     void computePinchZoomDeltas(ScrollAndScaleSet* scrollInfo);
     void makeScrollAndScaleSet(ScrollAndScaleSet* scrollInfo, gfx::Vector2d scrollOffset, float pageScale);