cc: Use impl-side painting code in LTH scroll layer test.

cc/trees/layer_tree_host_unittest_scroll.cc

 // Copyright 2012 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.h"
 
 #include "base/memory/weak_ptr.h"
-#include "cc/layers/content_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
+#include "cc/layers/picture_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_layer_tree_host_client.h"
+#include "cc/test/fake_picture_layer.h"
+#include "cc/test/fake_picture_layer_impl.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/vector2d_conversions.h"
 
 namespace cc {
 namespace {
@@ skipping 419 matching lines @@
         javascript_scroll_(40, 5),
         scroll_amount_(2, -1),
         num_scrolls_(0) {}
 
   virtual void SetupTree() OVERRIDE {
     layer_tree_host()->SetDeviceScaleFactor(device_scale_factor_);
 
     scoped_refptr<Layer> root_layer = Layer::Create();
     root_layer->SetBounds(gfx::Size(10, 10));
 
-    root_scroll_layer_ = ContentLayer::Create(&fake_content_layer_client_);
+    root_scroll_layer_ = FakePictureLayer::Create(&fake_content_layer_client_);
     root_scroll_layer_->SetBounds(gfx::Size(110, 110));
 
     root_scroll_layer_->SetPosition(gfx::Point());
 
     root_scroll_layer_->SetIsDrawable(true);
     root_scroll_layer_->SetScrollClipLayerId(root_layer->id());
     root_scroll_layer_->SetIsContainerForFixedPositionLayers(true);
     root_layer->AddChild(root_scroll_layer_);
 
-    child_layer_ = ContentLayer::Create(&fake_content_layer_client_);
+    child_layer_ = FakePictureLayer::Create(&fake_content_layer_client_);
     child_layer_->set_did_scroll_callback(
         base::Bind(&LayerTreeHostScrollTestCaseWithChild::DidScroll,
                    base::Unretained(this)));
     child_layer_->SetBounds(gfx::Size(110, 110));
 
     if (scroll_child_layer_) {
       // Scrolls on the child layer will happen at 5, 5. If they are treated
       // like device pixels, and device scale factor is 2, then they will
       // be considered at 2.5, 2.5 in logical pixels, and will miss this layer.
       child_layer_->SetPosition(gfx::Point(5, 5));
@@ skipping 60 matching lines @@
         break;
       case 2:
         EXPECT_VECTOR_EQ(javascript_scroll_ + scroll_amount_,
                          expected_scroll_layer_->scroll_offset());
         break;
     }
   }
 
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     LayerImpl* root_impl = impl->active_tree()->root_layer();
-    LayerImpl* root_scroll_layer_impl = root_impl->children()[0];
-    LayerImpl* child_layer_impl = root_scroll_layer_impl->children()[0];
+    FakePictureLayerImpl* root_scroll_layer_impl =
+        static_cast<FakePictureLayerImpl*>(root_impl->children()[0]);
+    FakePictureLayerImpl* child_layer_impl = static_cast<FakePictureLayerImpl*>(
+        root_scroll_layer_impl->children()[0]);
 
     LayerImpl* expected_scroll_layer_impl = NULL;
     LayerImpl* expected_no_scroll_layer_impl = NULL;
     if (scroll_child_layer_) {
       expected_scroll_layer_impl = child_layer_impl;
       expected_no_scroll_layer_impl = root_scroll_layer_impl;
     } else {
       expected_scroll_layer_impl = root_scroll_layer_impl;
       expected_no_scroll_layer_impl = child_layer_impl;
     }
 
     EXPECT_VECTOR_EQ(gfx::Vector2d(), root_impl->ScrollDelta());
     EXPECT_VECTOR_EQ(gfx::Vector2d(),
                      expected_no_scroll_layer_impl->ScrollDelta());
 
-    // Ensure device scale factor is affecting the layers.
-    gfx::Size expected_content_bounds = gfx::ToCeiledSize(
-        gfx::ScaleSize(root_scroll_layer_impl->bounds(), device_scale_factor_));
-    EXPECT_SIZE_EQ(expected_content_bounds,
-                   root_scroll_layer_->content_bounds());
+    // Ensure device scale factor is affecting the contents scale.

[danakj, 2014/08/12 13:26:46]

I think the comment was fine as is.

[sohanjg, 2014/08/12 13:38:24]

Done.

+    EXPECT_FLOAT_EQ(device_scale_factor_,
+                    root_scroll_layer_impl->HighResTiling()->contents_scale());
 
-    expected_content_bounds = gfx::ToCeiledSize(
-        gfx::ScaleSize(child_layer_impl->bounds(), device_scale_factor_));
-    EXPECT_SIZE_EQ(expected_content_bounds, child_layer_->content_bounds());
+    EXPECT_FLOAT_EQ(device_scale_factor_,
+                    child_layer_impl->HighResTiling()->contents_scale());
 
     switch (impl->active_tree()->source_frame_number()) {
       case 0: {
         // Gesture scroll on impl thread.
         InputHandler::ScrollStatus status = impl->ScrollBegin(
             gfx::ToCeiledPoint(expected_scroll_layer_impl->position() -
                                gfx::Vector2dF(0.5f, 0.5f)),
             InputHandler::Gesture);
         EXPECT_EQ(InputHandler::ScrollStarted, status);
         impl->ScrollBy(gfx::Point(), scroll_amount_);
@@ skipping 61 matching lines @@
   scoped_refptr<Layer> root_scroll_layer_;
   scoped_refptr<Layer> child_layer_;
   scoped_refptr<Layer> expected_scroll_layer_;
   scoped_refptr<Layer> expected_no_scroll_layer_;
 };
 
 TEST_F(LayerTreeHostScrollTestCaseWithChild,
        DeviceScaleFactor1_ScrollChild_DirectRenderer_MainThreadPaint) {
   device_scale_factor_ = 1.f;
   scroll_child_layer_ = true;
-  RunTest(true, false, false);
+  RunTest(true, false, true);

[danakj, 2014/08/12 13:26:46]

This test case is the same as the _ImplSidePaint below now. Let's remove it and
remove the _ImplSidePaint qualifier from the twin below.

[sohanjg, 2014/08/12 13:38:23]

Done.

 }
 
 TEST_F(LayerTreeHostScrollTestCaseWithChild,
        DeviceScaleFactor1_ScrollChild_DirectRenderer_ImplSidePaint) {
   device_scale_factor_ = 1.f;
   scroll_child_layer_ = true;
   RunTest(true, false, true);
 }
 
 TEST_F(LayerTreeHostScrollTestCaseWithChild,
        DeviceScaleFactor1_ScrollChild_DelegatingRenderer_MainThreadPaint) {
   device_scale_factor_ = 1.f;
   scroll_child_layer_ = true;
-  RunTest(true, true, false);
+  RunTest(true, true, true);

[danakj, 2014/08/12 13:26:46]

same

[sohanjg, 2014/08/12 13:38:23]

Done.

 }
 
 TEST_F(LayerTreeHostScrollTestCaseWithChild,
        DeviceScaleFactor1_ScrollChild_DelegatingRenderer_ImplSidePaint) {
   device_scale_factor_ = 1.f;
   scroll_child_layer_ = true;
   RunTest(true, true, true);
 }
 
 TEST_F(LayerTreeHostScrollTestCaseWithChild,
@@ skipping 49 matching lines @@
        DeviceScaleFactor15_ScrollRootScrollLayer_DelegatingRenderer) {
   device_scale_factor_ = 1.5f;
   scroll_child_layer_ = false;
   RunTest(true, true, true);
 }
 
 TEST_F(LayerTreeHostScrollTestCaseWithChild,
        DeviceScaleFactor2_ScrollRootScrollLayer_DirectRenderer_MainSidePaint) {
   device_scale_factor_ = 2.f;
   scroll_child_layer_ = false;
-  RunTest(true, false, false);
+  RunTest(true, false, true);

[danakj, 2014/08/12 13:26:46]

same 

[sohanjg, 2014/08/12 13:38:24]

Done.

 }
 
 TEST_F(LayerTreeHostScrollTestCaseWithChild,
        DeviceScaleFactor2_ScrollRootScrollLayer_DirectRenderer_ImplSidePaint) {
   device_scale_factor_ = 2.f;
   scroll_child_layer_ = false;
   RunTest(true, false, true);
 }
 
 TEST_F(LayerTreeHostScrollTestCaseWithChild,
@@ skipping 452 matching lines @@
   class FakeLayerScrollClient {
    public:
     void DidScroll() {
       owner_->DidScroll(layer_);
     }
     LayerTreeHostScrollTestLayerStructureChange* owner_;
     Layer* layer_;
   };
 
   Layer* CreateScrollLayer(Layer* parent, FakeLayerScrollClient* client) {
-    scoped_refptr<Layer> scroll_layer =
-        ContentLayer::Create(&fake_content_layer_client_);
+    scoped_refptr<PictureLayer> scroll_layer =
+        PictureLayer::Create(&fake_content_layer_client_);
     scroll_layer->SetBounds(gfx::Size(110, 110));
     scroll_layer->SetPosition(gfx::Point(0, 0));
     scroll_layer->SetIsDrawable(true);
     scroll_layer->SetScrollClipLayerId(parent->id());
     scroll_layer->SetBounds(gfx::Size(parent->bounds().width() + 100,
                                       parent->bounds().height() + 100));
     scroll_layer->set_did_scroll_callback(base::Bind(
         &FakeLayerScrollClient::DidScroll, base::Unretained(client)));
     client->owner_ = this;
     client->layer_ = scroll_layer.get();
     parent->AddChild(scroll_layer);
     return scroll_layer.get();
   }
 
   FakeLayerScrollClient root_scroll_layer_client_;
   FakeLayerScrollClient sibling_scroll_layer_client_;
   FakeLayerScrollClient child_scroll_layer_client_;
 
   FakeContentLayerClient fake_content_layer_client_;
 
   bool scroll_destroy_whole_tree_;
 };
 
 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyLayer) {
-    RunTest(true, false, false);
+  RunTest(true, false, true);
 }
 
 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) {
     scroll_destroy_whole_tree_ = true;

[danakj, 2014/08/12 13:26:46]

This should be a 2space indent.. mind fixing it while you're here?

[sohanjg, 2014/08/12 13:38:24]

Done.
strange why the cl format, didnt take care of this :\

-    RunTest(true, false, false);
+    RunTest(true, false, true);
 }
 
 }  // namespace
 }  // namespace cc