Revert 189830 "cc: Chromify LayerTreeHostCommon"

cc/trees/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/trees/layer_tree_host_impl.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 124 matching lines @@
         ASSERT_EQ(layer->scroll_delta(), gfx::Vector2d());
         for (size_t i = 0; i < layer->children().size(); ++i)
             expectClearedScrollDeltasRecursive(layer->children()[i]);
     }
 
     static void expectContains(const ScrollAndScaleSet& scrollInfo, int id, const gfx::Vector2d& scrollDelta)
     {
         int timesEncountered = 0;
 
         for (size_t i = 0; i < scrollInfo.scrolls.size(); ++i) {
-            if (scrollInfo.scrolls[i].layer_id != id)
+            if (scrollInfo.scrolls[i].layerId != id)
                 continue;
-            EXPECT_VECTOR_EQ(scrollDelta, scrollInfo.scrolls[i].scroll_delta);
+            EXPECT_VECTOR_EQ(scrollDelta, scrollInfo.scrolls[i].scrollDelta);
             timesEncountered++;
         }
 
         ASSERT_EQ(timesEncountered, 1);
     }
 
     static void expectNone(const ScrollAndScaleSet& scrollInfo, int id)
     {
         int timesEncountered = 0;
 
         for (size_t i = 0; i < scrollInfo.scrolls.size(); ++i) {
-            if (scrollInfo.scrolls[i].layer_id != id)
+            if (scrollInfo.scrolls[i].layerId != id)
                 continue;
             timesEncountered++;
         }
 
         ASSERT_EQ(0, timesEncountered);
     }
 
     void setupScrollAndContentsLayers(const gfx::Size& contentSize)
     {
         scoped_ptr<LayerImpl> root = LayerImpl::Create(m_hostImpl->active_tree(), 1);
@@ skipping 439 matching lines @@
         scrollLayer->SetScrollDelta(gfx::Vector2d());
 
         float pageScaleDelta = 2;
         m_hostImpl->PinchGestureBegin();
         m_hostImpl->PinchGestureUpdate(pageScaleDelta, gfx::Point(50, 50));
         m_hostImpl->PinchGestureEnd();
         EXPECT_TRUE(m_didRequestRedraw);
         EXPECT_TRUE(m_didRequestCommit);
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->page_scale_delta, pageScaleDelta);
+        EXPECT_EQ(scrollInfo->pageScaleDelta, pageScaleDelta);
 
         EXPECT_EQ(gfx::Vector2d(75, 75), m_hostImpl->active_tree()->root_layer()->max_scroll_offset());
     }
 
     // Scrolling after a pinch gesture should always be in local space.  The scroll deltas do not
     // have the page scale factor applied.
     {
         m_hostImpl->active_tree()->SetPageScaleFactorAndLimits(1, minPageScale, maxPageScale);
         m_hostImpl->active_tree()->SetPageScaleDelta(1);
         scrollLayer->SetImplTransform(identityScaleTransform);
@@ skipping 34 matching lines @@
         scrollLayer->SetScrollDelta(gfx::Vector2d());
 
         float pageScaleDelta = 2;
         m_hostImpl->PinchGestureBegin();
         m_hostImpl->PinchGestureUpdate(pageScaleDelta, gfx::Point(50, 50));
         m_hostImpl->PinchGestureEnd();
         EXPECT_TRUE(m_didRequestRedraw);
         EXPECT_TRUE(m_didRequestCommit);
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->page_scale_delta, pageScaleDelta);
+        EXPECT_EQ(scrollInfo->pageScaleDelta, pageScaleDelta);
     }
 
     // Zoom-in clamping
     {
         m_hostImpl->active_tree()->SetPageScaleFactorAndLimits(1, minPageScale, maxPageScale);
         scrollLayer->SetImplTransform(identityScaleTransform);
         scrollLayer->SetScrollDelta(gfx::Vector2d());
         float pageScaleDelta = 10;
 
         m_hostImpl->PinchGestureBegin();
         m_hostImpl->PinchGestureUpdate(pageScaleDelta, gfx::Point(50, 50));
         m_hostImpl->PinchGestureEnd();
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->page_scale_delta, maxPageScale);
+        EXPECT_EQ(scrollInfo->pageScaleDelta, maxPageScale);
     }
 
     // Zoom-out clamping
     {
         m_hostImpl->active_tree()->SetPageScaleFactorAndLimits(1, minPageScale, maxPageScale);
         scrollLayer->SetImplTransform(identityScaleTransform);
         scrollLayer->SetScrollDelta(gfx::Vector2d());
         scrollLayer->SetScrollOffset(gfx::Vector2d(50, 50));
 
         float pageScaleDelta = 0.1f;
         m_hostImpl->PinchGestureBegin();
         m_hostImpl->PinchGestureUpdate(pageScaleDelta, gfx::Point(0, 0));
         m_hostImpl->PinchGestureEnd();
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->page_scale_delta, minPageScale);
+        EXPECT_EQ(scrollInfo->pageScaleDelta, minPageScale);
 
         EXPECT_TRUE(scrollInfo->scrolls.empty());
     }
 
     // Two-finger panning should not happen based on pinch events only
     {
         m_hostImpl->active_tree()->SetPageScaleFactorAndLimits(1, minPageScale, maxPageScale);
         scrollLayer->SetImplTransform(identityScaleTransform);
         scrollLayer->SetScrollDelta(gfx::Vector2d());
         scrollLayer->SetScrollOffset(gfx::Vector2d(20, 20));
 
         float pageScaleDelta = 1;
         m_hostImpl->PinchGestureBegin();
         m_hostImpl->PinchGestureUpdate(pageScaleDelta, gfx::Point(10, 10));
         m_hostImpl->PinchGestureUpdate(pageScaleDelta, gfx::Point(20, 20));
         m_hostImpl->PinchGestureEnd();
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->page_scale_delta, pageScaleDelta);
+        EXPECT_EQ(scrollInfo->pageScaleDelta, pageScaleDelta);
         EXPECT_TRUE(scrollInfo->scrolls.empty());
     }
 
     // Two-finger panning should work with interleaved scroll events
     {
         m_hostImpl->active_tree()->SetPageScaleFactorAndLimits(1, minPageScale, maxPageScale);
         scrollLayer->SetImplTransform(identityScaleTransform);
         scrollLayer->SetScrollDelta(gfx::Vector2d());
         scrollLayer->SetScrollOffset(gfx::Vector2d(20, 20));
 
         float pageScaleDelta = 1;
         m_hostImpl->ScrollBegin(gfx::Point(10, 10), InputHandlerClient::Wheel);
         m_hostImpl->PinchGestureBegin();
         m_hostImpl->PinchGestureUpdate(pageScaleDelta, gfx::Point(10, 10));
         m_hostImpl->ScrollBy(gfx::Point(10, 10), gfx::Vector2d(-10, -10));
         m_hostImpl->PinchGestureUpdate(pageScaleDelta, gfx::Point(20, 20));
         m_hostImpl->PinchGestureEnd();
         m_hostImpl->ScrollEnd();
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->page_scale_delta, pageScaleDelta);
+        EXPECT_EQ(scrollInfo->pageScaleDelta, pageScaleDelta);
         expectContains(*scrollInfo, scrollLayer->id(), gfx::Vector2d(-10, -10));
     }
 }
 
 TEST_F(LayerTreeHostImplTest, pageScaleAnimation)
 {
     setupScrollAndContentsLayers(gfx::Size(100, 100));
     m_hostImpl->SetViewportSize(gfx::Size(50, 50), gfx::Size(50, 50));
     initializeRendererAndDrawFrame();
 
@@ skipping 14 matching lines @@
         scrollLayer->SetImplTransform(identityScaleTransform);
         scrollLayer->SetScrollOffset(gfx::Vector2d(50, 50));
 
         m_hostImpl->StartPageScaleAnimation(gfx::Vector2d(0, 0), false, 2, startTime, duration);
         m_hostImpl->Animate(halfwayThroughAnimation, base::Time());
         EXPECT_TRUE(m_didRequestRedraw);
         m_hostImpl->Animate(endTime, base::Time());
         EXPECT_TRUE(m_didRequestCommit);
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->page_scale_delta, 2);
+        EXPECT_EQ(scrollInfo->pageScaleDelta, 2);
         expectContains(*scrollInfo, scrollLayer->id(), gfx::Vector2d(-50, -50));
     }
 
     // Anchor zoom-out
     {
         m_hostImpl->active_tree()->SetPageScaleFactorAndLimits(1, minPageScale, maxPageScale);
         scrollLayer->SetImplTransform(identityScaleTransform);
         scrollLayer->SetScrollOffset(gfx::Vector2d(50, 50));
 
         m_hostImpl->StartPageScaleAnimation(gfx::Vector2d(25, 25), true, minPageScale, startTime, duration);
         m_hostImpl->Animate(endTime, base::Time());
         EXPECT_TRUE(m_didRequestRedraw);
         EXPECT_TRUE(m_didRequestCommit);
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->page_scale_delta, minPageScale);
+        EXPECT_EQ(scrollInfo->pageScaleDelta, minPageScale);
         // Pushed to (0,0) via clamping against contents layer size.
         expectContains(*scrollInfo, scrollLayer->id(), gfx::Vector2d(-50, -50));
     }
 }
 
 TEST_F(LayerTreeHostImplTest, pageScaleAnimationNoOp)
 {
     setupScrollAndContentsLayers(gfx::Size(100, 100));
     m_hostImpl->SetViewportSize(gfx::Size(50, 50), gfx::Size(50, 50));
     initializeRendererAndDrawFrame();
@@ skipping 15 matching lines @@
         scrollLayer->SetImplTransform(identityScaleTransform);
         scrollLayer->SetScrollOffset(gfx::Vector2d(50, 50));
 
         m_hostImpl->StartPageScaleAnimation(gfx::Vector2d(0, 0), true, 1, startTime, duration);
         m_hostImpl->Animate(halfwayThroughAnimation, base::Time());
         EXPECT_TRUE(m_didRequestRedraw);
         m_hostImpl->Animate(endTime, base::Time());
         EXPECT_TRUE(m_didRequestCommit);
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->page_scale_delta, 1);
+        EXPECT_EQ(scrollInfo->pageScaleDelta, 1);
         expectNone(*scrollInfo, scrollLayer->id());
     }
 }
 
 TEST_F(LayerTreeHostImplTest, compositorFrameMetadata)
 {
     setupScrollAndContentsLayers(gfx::Size(100, 100));
     m_hostImpl->SetViewportSize(gfx::Size(50, 50), gfx::Size(50, 50));
     m_hostImpl->active_tree()->SetPageScaleFactorAndLimits(1.0f, 0.5f, 4.0f);
     initializeRendererAndDrawFrame();
@@ skipping 3534 matching lines @@
         EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(), renderPassQuad->rect.ToString());
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(), renderPassQuad->mask_uv_rect.ToString());
 
         m_hostImpl->DrawLayers(&frame, base::TimeTicks::Now());
         m_hostImpl->DidDrawAllLayers(frame);
     }
 }
 
 }  // namespace
 }  // namespace cc