[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 c7f38f664664cf624e971961e784a50221dc08dd..5aaaf11dcbc6224c657da985347d25dc65344e91 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();
 
@@ -255,8 +255,6 @@ public:
 
     void renderingStats(RenderingStats*) const;
 
-    void updateRootScrollLayerImplTransform();
-
     void sendManagedMemoryStats(
        size_t memoryVisibleBytes,
        size_t memoryVisibleAndNearbyBytes,
@@ -300,18 +298,12 @@ public:
     template<typename RenderPassCuller>
     static void removeRenderPasses(RenderPassCuller, FrameData&);
 
+    // Exposed for testing.
+    float totalPageScaleFactor() const { return m_pinchZoomViewport.totalPageScaleFactor(); }

[danakj, 2012/12/13 00:03:37]

totalPageScaleFactorForTesting() (can probly drop the comment then)

+
 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);
 
@@ -322,6 +314,12 @@ protected:
     Proxy* m_proxy;
 
 private:
+    void animatePageScale(base::TimeTicks monotonicTime);
+    void animateScrollbars(base::TimeTicks monotonicTime);
+
+    void updateDrawProperties();
+    void resetNeedsUpdateDrawPropertiesForTesting() { m_needsUpdateDrawProperties = false; }

[danakj, 2012/12/13 00:03:37]

private fortesting method. can this be removed then?

+
     void computeDoubleTapZoomDeltas(ScrollAndScaleSet* scrollInfo);
     void computePinchZoomDeltas(ScrollAndScaleSet* scrollInfo);
     void makeScrollAndScaleSet(ScrollAndScaleSet* scrollInfo, gfx::Vector2d scrollOffset, float pageScale);