implTransform should be called on rootScrollLayer().

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 1237 matching lines @@
     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 remains constant because the impl thread did not scale.
     // TODO: If possible, use gfx::Transform() or Skia equality functions. At
     //       the moment we avoid that because skia does exact bit-wise equality
     //       checking that does not consider -0 == +0.
     //       http://code.google.com/p/chromium/issues/detail?id=162747
-    EXPECT_EQ(1.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(0, 0));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(0, 1));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(0, 2));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(0, 3));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(1, 0));
-    EXPECT_EQ(1.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(1, 1));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(1, 2));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(1, 3));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(2, 0));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(2, 1));
-    EXPECT_EQ(1.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(2, 2));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(2, 3));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(3, 0));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(3, 1));
-    EXPECT_EQ(0.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(3, 2));
-    EXPECT_EQ(1.0, m_hostImpl->rootLayer()->implTransform().matrix().getDouble(3, 3));
+    EXPECT_EQ(1.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(0, 0));

[enne (OOO), 2012/12/13 16:42:26]

Don't we have some matrix equal macro that you can compare to identity?

[wjmaclean, 2012/12/13 16:57:05]

You can just compare two matrices, if you can get them to be the same (which you
can't always do easily, see comment above re +0 and -0)

[enne (OOO), 2012/12/13 17:00:54]

Then the macro should be fixed to be resilient to this, like float equals has an
epsilon.

+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(0, 1));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(0, 2));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(0, 3));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(1, 0));
+    EXPECT_EQ(1.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(1, 1));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(1, 2));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(1, 3));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(2, 0));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(2, 1));
+    EXPECT_EQ(1.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(2, 2));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(2, 3));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(3, 0));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(3, 1));
+    EXPECT_EQ(0.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(3, 2));
+    EXPECT_EQ(1.0, m_hostImpl->rootScrollLayer()->implTransform().matrix().getDouble(3, 3));
 }
 
 TEST_P(LayerTreeHostImplTest, scrollRootAndChangePageScaleOnImplThread)
 {
     gfx::Size surfaceSize(10, 10);
     float pageScale = 2;
     scoped_ptr<LayerImpl> root = createScrollableLayer(1, surfaceSize);
     m_hostImpl->setRootLayer(root.Pass());
     m_hostImpl->setViewportSize(surfaceSize, surfaceSize);
     m_hostImpl->setPageScaleFactorAndLimits(1, 1, pageScale);
@@ skipping 15 matching lines @@
     // 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;
     expectedScale.Scale(pageScale, pageScale);
-    EXPECT_EQ(m_hostImpl->rootLayer()->implTransform(), expectedScale);
+    EXPECT_EQ(m_hostImpl->rootScrollLayer()->implTransform(), expectedScale);
 }
 
 TEST_P(LayerTreeHostImplTest, pageScaleDeltaAppliedToRootScrollLayerOnly)
 {
     gfx::Size surfaceSize(10, 10);
     float defaultPageScale = 1;
     gfx::Transform defaultPageScaleMatrix;
 
     float newPageScale = 2;
     gfx::Transform newPageScaleMatrix;
@@ skipping 3235 matching lines @@
     // Set new page scale on impl thread by pinching.
     m_hostImpl->pinchGestureBegin();
     m_hostImpl->pinchGestureUpdate(pageScale, gfx::Point());
     m_hostImpl->pinchGestureEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     gfx::Transform expectedImplTransform;
     expectedImplTransform.Scale(pageScale, pageScale);
 
     // Verify the pinch zoom took place.
-    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
+    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootScrollLayer()->implTransform());
 
     // The implTransform ignores the scroll if !pageScalePinchZoomEnabled,
     // so no point in continuing without it.
     if (!m_hostImpl->settings().pageScalePinchZoomEnabled)
         return;
 
     m_didRequestCommit = false;
     m_didRequestRedraw = false;
 
     // This scroll will force the viewport to pan horizontally.
@@ skipping 50 matching lines @@
 
     // Set new page scale on impl thread by pinching.
     m_hostImpl->pinchGestureBegin();
     m_hostImpl->pinchGestureUpdate(pageScale, gfx::Point());
     m_hostImpl->pinchGestureEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     gfx::Transform expectedImplTransform;
     expectedImplTransform.Scale(pageScale, pageScale);
 
-    EXPECT_EQ(m_hostImpl->rootLayer()->implTransform(), expectedImplTransform);
+    EXPECT_EQ(m_hostImpl->rootScrollLayer()->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 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->scrollEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     gfx::Vector2dF expectedTranslation = gfx::ScaleVector2d(scrollDelta, m_hostImpl->deviceScaleFactor());
     expectedImplTransform.Translate(-expectedTranslation.x(), -expectedTranslation.y());
 
-    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
+    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootScrollLayer()->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);
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
     m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
     m_hostImpl->scrollEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     expectedTranslation = gfx::ScaleVector2d(scrollDelta, m_hostImpl->deviceScaleFactor());
     expectedImplTransform.Translate(-expectedTranslation.x(), -expectedTranslation.y());
 
-    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
+    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootScrollLayer()->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());
 }
 
 TEST_P(LayerTreeHostImplTest, pinchZoomPanViewportWithDeviceScaleFactor1)
 {
     pinchZoomPanViewportTest(1);
@@ skipping 25 matching lines @@
 
     // Set new page scale on impl thread by pinching.
     m_hostImpl->pinchGestureBegin();
     m_hostImpl->pinchGestureUpdate(pageScale, gfx::Point());
     m_hostImpl->pinchGestureEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     gfx::Transform expectedImplTransform;
     expectedImplTransform.Scale(pageScale, pageScale);
 
-    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
+    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootScrollLayer()->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 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->scrollEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     // 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());
+    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootScrollLayer()->implTransform());
 
     // Further scrolling should move the pinchZoomViewport only.
     scrollDelta = gfx::Vector2d(2, 0);
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
     m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
     m_hostImpl->scrollEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     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);
+    EXPECT_EQ(m_hostImpl->rootScrollLayer()->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);
     expectedScrollDelta += scrollDelta;
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
     m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
     m_hostImpl->scrollEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     // 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());
+    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootScrollLayer()->implTransform());
 
     // pinchZoomViewport scroll only.
     scrollDelta = gfx::Vector2d(0, 1);
     EXPECT_EQ(InputHandlerClient::ScrollStarted, m_hostImpl->scrollBegin(gfx::Point(0, 0), InputHandlerClient::Gesture));
     m_hostImpl->scrollBy(gfx::Point(), scrollDelta);
     m_hostImpl->scrollEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     expectedPanDelta = scrollDelta;
     expectedTranslation = gfx::ScaleVector2d(expectedPanDelta, m_hostImpl->deviceScaleFactor());
     expectedImplTransform.Translate(-expectedTranslation.x(), -expectedTranslation.y());
 
-    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
+    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootScrollLayer()->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);
     EXPECT_EQ(expectedMaxScroll, m_hostImpl->rootLayer()->maxScrollOffset());
 }
 
 TEST_P(LayerTreeHostImplTest, pinchZoomPanViewportAndScrollWithDeviceScaleFactor)
 {
     pinchZoomPanViewportAndScrollTest(1);
@@ skipping 27 matching lines @@
 
     // Set new page scale on impl thread by pinching.
     m_hostImpl->pinchGestureBegin();
     m_hostImpl->pinchGestureUpdate(pageScale, gfx::Point());
     m_hostImpl->pinchGestureEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     gfx::Transform expectedImplTransform;
     expectedImplTransform.Scale(pageScale, pageScale);
 
-    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
+    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootScrollLayer()->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 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->scrollEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     // 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);
+    EXPECT_EQ(m_hostImpl->rootScrollLayer()->implTransform(), expectedImplTransform);
 
     // Perform same test sequence in y-direction also.
     scrollDelta = gfx::Vector2d(0, 5);
     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->scrollEnd();
     m_hostImpl->updateRootScrollLayerImplTransform();
 
     // 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());
 
-    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootLayer()->implTransform());
+    EXPECT_EQ(expectedImplTransform, m_hostImpl->rootScrollLayer()->implTransform());
 }
 
 TEST_P(LayerTreeHostImplTest, pinchZoomPanViewportAndScrollBoundaryWithDeviceScaleFactor)
 {
     pinchZoomPanViewportAndScrollBoundaryTest(1);
 }
 
 TEST_P(LayerTreeHostImplTest, pinchZoomPanViewportAndScrollBoundaryWithDeviceScaleFactor2)
 {
     pinchZoomPanViewportAndScrollBoundaryTest(2);
@@ skipping 37 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