[cc] Fold more update calls into updateDrawProperties

cc/layer_tree_host_impl_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer_tree_host_impl.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 192 matching lines @@
     }
 
     void pinchZoomPanViewportForcesCommitRedraw(const float deviceScaleFactor);
     void pinchZoomPanViewportTest(const float deviceScaleFactor);
     void pinchZoomPanViewportAndScrollTest(const float deviceScaleFactor);
     void pinchZoomPanViewportAndScrollBoundaryTest(const float deviceScaleFactor);
 
 protected:
     virtual scoped_ptr<OutputSurface> createOutputSurface() { return createFakeOutputSurface(); }
 
+    void prepareToDrawEtc() {
+      LayerTreeHostImpl::FrameData frameData;
+      m_hostImpl->prepareToDraw(frameData);
+      m_hostImpl->didDrawAllLayers(frameData);
+    }
+
     FakeProxy m_proxy;
     DebugScopedSetImplThread m_alwaysImplThread;
     DebugScopedSetMainThreadBlocked m_alwaysMainThreadBlocked;
 
     scoped_ptr<LayerTreeHostImpl> m_hostImpl;
     bool m_onCanDrawStateChangedCalled;
     bool m_didRequestCommit;
     bool m_didRequestRedraw;
     bool m_reduceMemoryResult;
 };
@@ skipping 1065 matching lines @@
     gfx::Vector2d expectedScrollDelta(scrollDelta);
     gfx::Vector2d expectedMaxScroll(m_hostImpl->rootLayer()->maxScrollOffset());
     EXPECT_EQ(m_hostImpl->scrollBegin(gfx::Point(5, 5), InputHandlerClient::Wheel), InputHandlerClient::ScrollStarted);
     m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
     m_hostImpl->scrollEnd();
 
     // Set new page scale on impl thread by pinching.
     m_hostImpl->pinchGestureBegin();
     m_hostImpl->pinchGestureUpdate(pageScale, gfx::Point());
     m_hostImpl->pinchGestureEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     // The scroll delta is not scaled because the main thread did not scale.
     scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->processScrollDeltas();
     expectContains(*scrollInfo.get(), m_hostImpl->rootLayer()->id(), expectedScrollDelta);
 
     // The scroll range should also have been updated.
     EXPECT_EQ(m_hostImpl->rootLayer()->maxScrollOffset(), expectedMaxScroll);
 
     // The page scale delta should match the new scale on the impl side.
     gfx::Transform expectedScale;
@@ skipping 17 matching lines @@
     LayerImpl* child = root->children()[0];
 
     scoped_ptr<LayerImpl> scrollableChild = createScrollableLayer(3, surfaceSize);
     child->addChild(scrollableChild.Pass());
     LayerImpl* grandChild = child->children()[0];
 
     // Set new page scale on impl thread by pinching.
     m_hostImpl->pinchGestureBegin();
     m_hostImpl->pinchGestureUpdate(newPageScale, gfx::Point());
     m_hostImpl->pinchGestureEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     // The page scale delta should only be applied to the scrollable root layer.
     EXPECT_EQ(root->implTransform(), newPageScaleMatrix);
     EXPECT_EQ(child->implTransform(), defaultPageScaleMatrix);
     EXPECT_EQ(grandChild->implTransform(), defaultPageScaleMatrix);
 
     // Make sure all the layers are drawn with the page scale delta applied, i.e., the page scale
     // delta on the root layer is applied hierarchically.
     LayerTreeHostImpl::FrameData frame;
     EXPECT_TRUE(m_hostImpl->prepareToDraw(frame));
@@ skipping 27 matching lines @@
     gfx::Vector2d scrollDelta(0, 10);
     gfx::Vector2d expectedScrollDelta(scrollDelta);
     gfx::Vector2d expectedMaxScroll(child->maxScrollOffset());
     EXPECT_EQ(m_hostImpl->scrollBegin(gfx::Point(5, 5), InputHandlerClient::Wheel), InputHandlerClient::ScrollStarted);
     m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
     m_hostImpl->scrollEnd();
 
     float pageScale = 2;
     m_hostImpl->setPageScaleFactorAndLimits(pageScale, 1, pageScale);
 
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     if (!m_hostImpl->settings().pageScalePinchZoomEnabled) {
         // The scale should apply to the scroll delta.
         expectedScrollDelta = gfx::ToFlooredVector2d(gfx::ScaleVector2d(expectedScrollDelta, pageScale));
     }
     scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->processScrollDeltas();
     expectContains(*scrollInfo.get(), scrollLayerId, expectedScrollDelta);
 
     // The scroll range should not have changed.
     EXPECT_EQ(child->maxScrollOffset(), expectedMaxScroll);
@@ skipping 3155 matching lines @@
     root->setMaxScrollOffset(gfx::Vector2d());
     m_hostImpl->setRootLayer(root.Pass());
     m_hostImpl->setViewportSize(layoutSurfaceSize, deviceSurfaceSize);
     m_hostImpl->setPageScaleFactorAndLimits(1, 1, pageScale);
     initializeRendererAndDrawFrame();
 
     // Set new page scale on impl thread by pinching.
     m_hostImpl->pinchGestureBegin();
     m_hostImpl->pinchGestureUpdate(pageScale, gfx::Point());
     m_hostImpl->pinchGestureEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     gfx::Transform expectedImplTransform;
     expectedImplTransform.Scale(pageScale, pageScale);
 
     // Verify the pinch zoom took place.
     EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
 
     // The implTransform ignores the scroll if !pageScalePinchZoomEnabled,
     // so no point in continuing without it.
     if (!m_hostImpl->settings().pageScalePinchZoomEnabled)
@@ skipping 51 matching lines @@
     root->setMaxScrollOffset(gfx::Vector2d());
     m_hostImpl->setRootLayer(root.Pass());
     m_hostImpl->setViewportSize(layoutSurfaceSize, deviceSurfaceSize);
     m_hostImpl->setPageScaleFactorAndLimits(1, 1, pageScale);
     initializeRendererAndDrawFrame();
 
     // Set new page scale on impl thread by pinching.
     m_hostImpl->pinchGestureBegin();
     m_hostImpl->pinchGestureUpdate(pageScale, gfx::Point());
     m_hostImpl->pinchGestureEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     gfx::Transform expectedImplTransform;
     expectedImplTransform.Scale(pageScale, pageScale);
 
     EXPECT_EQ(m_hostImpl->rootLayer()->implTransform(), expectedImplTransform);
 
     // The implTransform ignores the scroll if !pageScalePinchZoomEnabled,
     // so no point in continuing without it.
     if (!m_hostImpl->settings().pageScalePinchZoomEnabled)
         return;
 
     gfx::Vector2d scrollDelta(5, 0);
+    gfx::Vector2d scrollDeltaInZoomedViewport = ToFlooredVector2d(gfx::ScaleVector2d(scrollDelta, m_hostImpl->totalPageScaleFactorForTesting()));

[danakj, 2012/12/13 18:12:28]

At the least I'd like a TODO here saying that the expectedTranslation needs to
be scaled, not the scroll input.

     gfx::Vector2d expectedMaxScroll(m_hostImpl->rootLayer()->maxScrollOffset());
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
-    m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
+    m_hostImpl->scrollBy(gfx::Point(), scrollDeltaInZoomedViewport);
     m_hostImpl->scrollEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     gfx::Vector2dF expectedTranslation = gfx::ScaleVector2d(scrollDelta, m_hostImpl->deviceScaleFactor());
     expectedImplTransform.Translate(-expectedTranslation.x(), -expectedTranslation.y());
 
     EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
     // No change expected.
     EXPECT_EQ(expectedMaxScroll, m_hostImpl->rootLayer()->maxScrollOffset());
     // None of the scroll delta should have been used for document scroll.
     scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->processScrollDeltas();
     expectNone(*scrollInfo.get(), m_hostImpl->rootLayer()->id());
 
     // Test scroll in y-direction also.
     scrollDelta = gfx::Vector2d(0, 5);
+    scrollDeltaInZoomedViewport = ToFlooredVector2d(gfx::ScaleVector2d(scrollDelta, m_hostImpl->totalPageScaleFactorForTesting()));
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
-    m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
+    m_hostImpl->scrollBy(gfx::Point(), scrollDeltaInZoomedViewport);
     m_hostImpl->scrollEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     expectedTranslation = gfx::ScaleVector2d(scrollDelta, m_hostImpl->deviceScaleFactor());
     expectedImplTransform.Translate(-expectedTranslation.x(), -expectedTranslation.y());
 
     EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
     // No change expected.
     EXPECT_EQ(expectedMaxScroll, m_hostImpl->rootLayer()->maxScrollOffset());
     // None of the scroll delta should have been used for document scroll.
     scrollInfo = m_hostImpl->processScrollDeltas();
     expectNone(*scrollInfo.get(), m_hostImpl->rootLayer()->id());
@@ skipping 25 matching lines @@
     root->setMaxScrollOffset(gfx::Vector2d(3, 4));
     m_hostImpl->setRootLayer(root.Pass());
     m_hostImpl->setViewportSize(layoutSurfaceSize, deviceSurfaceSize);
     m_hostImpl->setPageScaleFactorAndLimits(1, 1, pageScale);
     initializeRendererAndDrawFrame();
 
     // Set new page scale on impl thread by pinching.
     m_hostImpl->pinchGestureBegin();
     m_hostImpl->pinchGestureUpdate(pageScale, gfx::Point());
     m_hostImpl->pinchGestureEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     gfx::Transform expectedImplTransform;
     expectedImplTransform.Scale(pageScale, pageScale);
 
     EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
 
     // The implTransform ignores the scroll if !pageScalePinchZoomEnabled,
     // so no point in continuing without it.
     if (!m_hostImpl->settings().pageScalePinchZoomEnabled)
         return;
 
     // Scroll document only: scrollDelta chosen to move document horizontally
     // to its max scroll offset.
     gfx::Vector2d scrollDelta(3, 0);
+    gfx::Vector2d scrollDeltaInZoomedViewport = ToFlooredVector2d(gfx::ScaleVector2d(scrollDelta, m_hostImpl->totalPageScaleFactorForTesting()));
     gfx::Vector2d expectedScrollDelta(scrollDelta);
     gfx::Vector2d expectedMaxScroll(m_hostImpl->rootLayer()->maxScrollOffset());
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
-    m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
+    m_hostImpl->scrollBy(gfx::Point(), scrollDeltaInZoomedViewport);
     m_hostImpl->scrollEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     // The scroll delta is not scaled because the main thread did not scale.
     scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->processScrollDeltas();
     expectContains(*scrollInfo.get(), m_hostImpl->rootLayer()->id(), expectedScrollDelta);
     EXPECT_EQ(expectedMaxScroll, m_hostImpl->rootLayer()->maxScrollOffset());
 
     // Verify we did not change the implTransform this time.
     EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
 
     // Further scrolling should move the pinchZoomViewport only.
     scrollDelta = gfx::Vector2d(2, 0);
+    scrollDeltaInZoomedViewport = ToFlooredVector2d(gfx::ScaleVector2d(scrollDelta, m_hostImpl->totalPageScaleFactorForTesting()));
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
-    m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
+    m_hostImpl->scrollBy(gfx::Point(), scrollDeltaInZoomedViewport);
     m_hostImpl->scrollEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     gfx::Vector2d expectedPanDelta(scrollDelta);
     gfx::Vector2dF expectedTranslation = gfx::ScaleVector2d(expectedPanDelta, m_hostImpl->deviceScaleFactor());
     expectedImplTransform.Translate(-expectedTranslation.x(), -expectedTranslation.y());
 
     EXPECT_EQ(m_hostImpl->rootLayer()->implTransform(), expectedImplTransform);
 
     // The scroll delta on the main thread should not have been affected by this.
     scrollInfo = m_hostImpl->processScrollDeltas();
     expectContains(*scrollInfo.get(), m_hostImpl->rootLayer()->id(), expectedScrollDelta);
     EXPECT_EQ(expectedMaxScroll, m_hostImpl->rootLayer()->maxScrollOffset());
 
     // Perform same test sequence in y-direction also.
     // Document only scroll.
     scrollDelta = gfx::Vector2d(0, 4);
+    scrollDeltaInZoomedViewport = ToFlooredVector2d(gfx::ScaleVector2d(scrollDelta, m_hostImpl->totalPageScaleFactorForTesting()));
     expectedScrollDelta += scrollDelta;
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
-    m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
+    m_hostImpl->scrollBy(gfx::Point(), scrollDeltaInZoomedViewport);
     m_hostImpl->scrollEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     // The scroll delta is not scaled because the main thread did not scale.
     scrollInfo = m_hostImpl->processScrollDeltas();
     expectContains(*scrollInfo.get(), m_hostImpl->rootLayer()->id(), expectedScrollDelta);
     EXPECT_EQ(expectedMaxScroll, m_hostImpl->rootLayer()->maxScrollOffset());
 
     // Verify we did not change the implTransform this time.
     EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
 
     // pinchZoomViewport scroll only.
     scrollDelta = gfx::Vector2d(0, 1);
+    scrollDeltaInZoomedViewport = ToFlooredVector2d(gfx::ScaleVector2d(scrollDelta, m_hostImpl->totalPageScaleFactorForTesting()));
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
-    m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
+    m_hostImpl->scrollBy(gfx::Point(), scrollDeltaInZoomedViewport);
     m_hostImpl->scrollEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     expectedPanDelta = scrollDelta;
     expectedTranslation = gfx::ScaleVector2d(expectedPanDelta, m_hostImpl->deviceScaleFactor());
     expectedImplTransform.Translate(-expectedTranslation.x(), -expectedTranslation.y());
 
     EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
 
     // The scroll delta on the main thread should not have been affected by this.
     scrollInfo = m_hostImpl->processScrollDeltas();
     expectContains(*scrollInfo.get(), m_hostImpl->rootLayer()->id(), expectedScrollDelta);
@@ skipping 28 matching lines @@
     root->setMaxScrollOffset(gfx::Vector2d(3, 4));
     m_hostImpl->setRootLayer(root.Pass());
     m_hostImpl->setViewportSize(layoutSurfaceSize, deviceSurfaceSize);
     m_hostImpl->setPageScaleFactorAndLimits(1, 1, pageScale);
     initializeRendererAndDrawFrame();
 
     // Set new page scale on impl thread by pinching.
     m_hostImpl->pinchGestureBegin();
     m_hostImpl->pinchGestureUpdate(pageScale, gfx::Point());
     m_hostImpl->pinchGestureEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     gfx::Transform expectedImplTransform;
     expectedImplTransform.Scale(pageScale, pageScale);
 
     EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
 
     // The implTransform ignores the scroll if !pageScalePinchZoomEnabled,
     // so no point in continuing without it.
     if (!m_hostImpl->settings().pageScalePinchZoomEnabled)
         return;
 
     // Scroll document and pann zoomViewport in one scroll-delta.
     gfx::Vector2d scrollDelta(5, 0);
+    gfx::Vector2d scrollDeltaInZoomedViewport = ToFlooredVector2d(gfx::ScaleVector2d(scrollDelta, m_hostImpl->totalPageScaleFactorForTesting()));
     gfx::Vector2d expectedScrollDelta(gfx::Vector2d(3, 0)); // This component gets handled by document scroll.
     gfx::Vector2d expectedMaxScroll(m_hostImpl->rootLayer()->maxScrollOffset());
 
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
-    m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
+    m_hostImpl->scrollBy(gfx::Point(), scrollDeltaInZoomedViewport);
     m_hostImpl->scrollEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     // The scroll delta is not scaled because the main thread did not scale.
     scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->processScrollDeltas();
     expectContains(*scrollInfo.get(), m_hostImpl->rootLayer()->id(), expectedScrollDelta);
     EXPECT_EQ(expectedMaxScroll, m_hostImpl->rootLayer()->maxScrollOffset());
 
     gfx::Vector2d expectedPanDelta(2, 0); // This component gets handled by zoomViewport pan.
     gfx::Vector2dF expectedTranslation = gfx::ScaleVector2d(expectedPanDelta, m_hostImpl->deviceScaleFactor());
     expectedImplTransform.Translate(-expectedTranslation.x(), -expectedTranslation.y());
 
     EXPECT_EQ(m_hostImpl->rootLayer()->implTransform(), expectedImplTransform);
 
     // Perform same test sequence in y-direction also.
     scrollDelta = gfx::Vector2d(0, 5);
+    scrollDeltaInZoomedViewport = ToFlooredVector2d(gfx::ScaleVector2d(scrollDelta, m_hostImpl->totalPageScaleFactorForTesting()));
     expectedScrollDelta += gfx::Vector2d(0, 4); // This component gets handled by document scroll.
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
-    m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
+    m_hostImpl->scrollBy(gfx::Point(), scrollDeltaInZoomedViewport);
     m_hostImpl->scrollEnd();
-    m_hostImpl->updateRootScrollLayerImplTransform();
+    prepareToDrawEtc();
 
     // The scroll delta is not scaled because the main thread did not scale.
     scrollInfo = m_hostImpl->processScrollDeltas(); // This component gets handled by zoomViewport pan.
     expectContains(*scrollInfo.get(), m_hostImpl->rootLayer()->id(), expectedScrollDelta);
     EXPECT_EQ(expectedMaxScroll, m_hostImpl->rootLayer()->maxScrollOffset());
 
     expectedPanDelta = gfx::Vector2d(0, 1);
     expectedTranslation = gfx::ScaleVector2d(expectedPanDelta, m_hostImpl->deviceScaleFactor());
     expectedImplTransform.Translate(-expectedTranslation.x(), -expectedTranslation.y());
 
@@ skipping 48 matching lines @@
     gfx::Rect noDamage = gfx::Rect(m_hostImpl->deviceViewportSize());
     drawFrameAndTestDamage(noDamage);
 }
 
 INSTANTIATE_TEST_CASE_P(LayerTreeHostImplTests,
                         LayerTreeHostImplTest,
                         ::testing::Values(false, true));
 
 }  // namespace
 }  // namespace cc