Commit 4e95f763 authored by danakj's avatar danakj Committed by Commit bot

cc: Make unittests use FakePictureLayer instead of FakeContentLayer.

The latter is going away. Long live Implside painting. This
fixes cc/trees/layer_tree_host_unittest_animation.cc,
cc/trees/layer_tree_host_unittest_copyrequest.cc and
cc/trees/layer_tree_host_common_unittest.cc.

R=enne, vmpstr
BUG=413479
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1169643002

Cr-Commit-Position: refs/heads/master@{#333111}
parent d9f0ed30
......@@ -21,9 +21,7 @@
#include "cc/output/copy_output_request.h"
#include "cc/output/copy_output_result.h"
#include "cc/test/animation_test_common.h"
#include "cc/test/fake_content_layer.h"
#include "cc/test/fake_content_layer_client.h"
#include "cc/test/fake_content_layer_impl.h"
#include "cc/test/fake_impl_proxy.h"
#include "cc/test/fake_layer_tree_host.h"
#include "cc/test/fake_layer_tree_host_impl.h"
......@@ -9379,8 +9377,8 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeMain) {
make_scoped_refptr(new LayerWithForcedDrawsContent(layer_settings()));
scoped_refptr<LayerWithForcedDrawsContent> grandchild =
make_scoped_refptr(new LayerWithForcedDrawsContent(layer_settings()));
scoped_refptr<FakeContentLayer> greatgrandchild(
FakeContentLayer::Create(layer_settings(), &client));
scoped_refptr<FakePictureLayer> greatgrandchild(
FakePictureLayer::Create(layer_settings(), &client));
SetLayerPropertiesForTesting(root.get(), identity, gfx::Point3F(),
gfx::PointF(), gfx::Size(100, 100), true, false);
SetLayerPropertiesForTesting(child.get(), identity, gfx::Point3F(),
......@@ -9452,8 +9450,8 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeImpl) {
scoped_ptr<LayerImpl> grandchild =
LayerImpl::Create(host_impl.active_tree(), 3);
scoped_ptr<FakeContentLayerImpl> greatgrandchild(
FakeContentLayerImpl::Create(host_impl.active_tree(), 4));
scoped_ptr<FakePictureLayerImpl> greatgrandchild(
FakePictureLayerImpl::Create(host_impl.active_tree(), 4));
child->SetDrawsContent(true);
grandchild->SetDrawsContent(true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment