cc/trees/layer_tree_host_impl_unittest.cc - Issue 1912893002: cc : Stop pushing properties not used by LayerImpl to LayerImpl. (2)

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 1912893002: cc : Stop pushing properties not used by LayerImpl to LayerImpl. (2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« cc/layers/layer.h ('K') | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_impl_unittest.cc » ('j') | third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/trees/layer_tree_host_impl_unittest.cc

diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc

index 34e68e17ae8e58a28b8aca92ce1e9ac327063625..a12a4632d6d2fa0b34af0619df189accd9f27d24 100644

--- a/cc/trees/layer_tree_host_impl_unittest.cc

+++ b/cc/trees/layer_tree_host_impl_unittest.cc

@@ -217,7 +217,7 @@ class LayerTreeHostImplTest : public testing::Test,

root->SetBounds(gfx::Size(10, 10));

root->SetDrawsContent(true);

root->draw_properties().visible_layer_rect = gfx::Rect(0, 0, 10, 10);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

host_impl_->active_tree()->SetRootLayer(std::move(root));

}

@@ -285,7 +285,7 @@ class LayerTreeHostImplTest : public testing::Test,

std::unique_ptr<LayerImpl> root = LayerImpl::Create(layer_tree_impl, 1);

root->SetBounds(content_size);

root->SetPosition(gfx::PointF());

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

std::unique_ptr<LayerImpl> inner_scroll =

LayerImpl::Create(layer_tree_impl, kInnerViewportScrollLayerId);

@@ -1305,7 +1305,7 @@ TEST_F(LayerTreeHostImplTest, AnimationSchedulingPendingTree) {

LayerImpl::Create(host_impl_->pending_tree(), 1));

LayerImpl* root = host_impl_->pending_tree()->root_layer();

root->SetBounds(gfx::Size(50, 50));

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

root->AddChild(LayerImpl::Create(host_impl_->pending_tree(), 2));

LayerImpl* child = root->children()[0];

@@ -1355,7 +1355,7 @@ TEST_F(LayerTreeHostImplTest, AnimationSchedulingActiveTree) {

LayerImpl::Create(host_impl_->active_tree(), 1));

LayerImpl* root = host_impl_->active_tree()->root_layer();

root->SetBounds(gfx::Size(50, 50));

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

root->AddChild(LayerImpl::Create(host_impl_->active_tree(), 2));

LayerImpl* child = root->children()[0];

@@ -3298,7 +3298,7 @@ class DidDrawCheckLayer : public LayerImpl {

std::vector<std::unique_ptr<CopyOutputRequest>> requests;

requests.push_back(

CopyOutputRequest::CreateRequest(base::Bind(&IgnoreResult)));

- SetForceRenderSurface(true);

+ test_properties()->force_render_surface = true;

PassCopyRequests(&requests);

}

@@ -3330,7 +3330,7 @@ TEST_F(LayerTreeHostImplTest, WillDrawReturningFalseDoesNotCall) {

host_impl_->active_tree()->root_layer());

root->AddChild(DidDrawCheckLayer::Create(host_impl_->active_tree(), 2));

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

DidDrawCheckLayer* layer =

static_cast<DidDrawCheckLayer*>(root->children()[0]);

@@ -3371,7 +3371,7 @@ TEST_F(LayerTreeHostImplTest, DidDrawNotCalledOnHiddenLayer) {

DidDrawCheckLayer* root = static_cast<DidDrawCheckLayer*>(

host_impl_->active_tree()->root_layer());

root->SetMasksToBounds(true);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

root->AddChild(DidDrawCheckLayer::Create(host_impl_->active_tree(), 2));

DidDrawCheckLayer* layer =

static_cast<DidDrawCheckLayer*>(root->children()[0]);

@@ -3426,7 +3426,7 @@ TEST_F(LayerTreeHostImplTest, WillDrawNotCalledOnOccludedLayer) {

static_cast<DidDrawCheckLayer*>(root->children()[0]);

root->AddChild(DidDrawCheckLayer::Create(host_impl_->active_tree(), 3));

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

DidDrawCheckLayer* top_layer =

static_cast<DidDrawCheckLayer*>(root->children()[1]);

// This layer covers the occluded_layer above. Make this layer large so it can

@@ -3458,7 +3458,7 @@ TEST_F(LayerTreeHostImplTest, DidDrawCalledOnAllLayers) {

static_cast<DidDrawCheckLayer*>(host_impl_->active_tree()->root_layer());

root->AddChild(DidDrawCheckLayer::Create(host_impl_->active_tree(), 2));

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

DidDrawCheckLayer* layer1 =

static_cast<DidDrawCheckLayer*>(root->children()[0]);

@@ -3466,7 +3466,7 @@ TEST_F(LayerTreeHostImplTest, DidDrawCalledOnAllLayers) {

DidDrawCheckLayer* layer2 =

static_cast<DidDrawCheckLayer*>(layer1->children()[0]);

- layer1->SetForceRenderSurface(true);

+ layer1->test_properties()->force_render_surface = true;

layer1->SetShouldFlattenTransform(true);

EXPECT_FALSE(root->did_draw_called());

@@ -3623,7 +3623,7 @@ TEST_F(LayerTreeHostImplTest, PrepareToDrawSucceedsAndFails) {

DidDrawCheckLayer::Create(host_impl_->active_tree(), 1));

DidDrawCheckLayer* root =

static_cast<DidDrawCheckLayer*>(host_impl_->active_tree()->root_layer());

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

LayerTreeHostImpl::FrameData frame;

SetNeedsRebuildPropertyTrees();

@@ -3722,7 +3722,7 @@ TEST_F(LayerTreeHostImplTest,

DidDrawCheckLayer::Create(host_impl_->active_tree(), 1));

DidDrawCheckLayer* root =

static_cast<DidDrawCheckLayer*>(host_impl_->active_tree()->root_layer());

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

SetNeedsRebuildPropertyTrees();

host_impl_->OnDraw(external_transform, external_viewport, external_clip,

@@ -3783,7 +3783,7 @@ TEST_F(LayerTreeHostImplTest, ScrollRootIgnored) {

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl_->active_tree(), 1);

root->SetScrollClipLayer(Layer::INVALID_ID);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

host_impl_->active_tree()->SetRootLayer(std::move(root));

SetNeedsRebuildPropertyTrees();

DrawFrame();

@@ -3881,7 +3881,7 @@ class LayerTreeHostImplTopControlsTest : public LayerTreeHostImplTest {

root->SetPosition(gfx::PointF());

root->SetDrawsContent(false);

root->SetIsContainerForFixedPositionLayers(true);

- root_clip->SetForceRenderSurface(true);

+ root_clip->test_properties()->force_render_surface = true;

outer_clip->SetBounds(outer_viewport_size);

outer_scroll->SetScrollClipLayer(outer_clip->id());

outer_scroll->SetBounds(scroll_layer_size);

@@ -4691,7 +4691,7 @@ TEST_F(LayerTreeHostImplTest, ScrollNonCompositedRoot) {

scroll_layer->AddChild(std::move(content_layer));

scroll_clip_layer->AddChild(std::move(scroll_layer));

- scroll_clip_layer->SetForceRenderSurface(true);

+ scroll_clip_layer->test_properties()->force_render_surface = true;

host_impl_->active_tree()->SetRootLayer(std::move(scroll_clip_layer));

host_impl_->SetViewportSize(surface_size);

SetNeedsRebuildPropertyTrees();

@@ -4714,7 +4714,7 @@ TEST_F(LayerTreeHostImplTest, ScrollChildCallsCommitAndRedraw) {

LayerImpl::Create(host_impl_->active_tree(), 1);

root->SetBounds(surface_size);

root->AddChild(CreateScrollableLayer(2, contents_size, root.get()));

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

host_impl_->active_tree()->SetRootLayer(std::move(root));

host_impl_->SetViewportSize(surface_size);

SetNeedsRebuildPropertyTrees();

@@ -4735,7 +4735,7 @@ TEST_F(LayerTreeHostImplTest, ScrollMissesChild) {

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl_->active_tree(), 1);

root->AddChild(CreateScrollableLayer(2, surface_size, root.get()));

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

host_impl_->active_tree()->SetRootLayer(std::move(root));

host_impl_->SetViewportSize(surface_size);

SetNeedsRebuildPropertyTrees();

@@ -4757,7 +4757,7 @@ TEST_F(LayerTreeHostImplTest, ScrollMissesBackfacingChild) {

gfx::Size surface_size(10, 10);

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl_->active_tree(), 1);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

std::unique_ptr<LayerImpl> child =

CreateScrollableLayer(2, surface_size, root.get());

host_impl_->SetViewportSize(surface_size);

@@ -4765,7 +4765,7 @@ TEST_F(LayerTreeHostImplTest, ScrollMissesBackfacingChild) {

gfx::Transform matrix;

matrix.RotateAboutXAxis(180.0);

child->SetTransform(matrix);

- child->SetDoubleSided(false);

+ child->test_properties()->double_sided = false;

root->AddChild(std::move(child));

host_impl_->active_tree()->SetRootLayer(std::move(root));

@@ -4800,7 +4800,7 @@ TEST_F(LayerTreeHostImplTest, ScrollBlockedByContentLayer) {

CreateScrollableLayer(2, surface_size, clip_layer.get());

scroll_layer->AddChild(std::move(content_layer));

clip_layer->AddChild(std::move(scroll_layer));

- clip_layer->SetForceRenderSurface(true);

+ clip_layer->test_properties()->force_render_surface = true;

host_impl_->active_tree()->SetRootLayer(std::move(clip_layer));

host_impl_->SetViewportSize(surface_size);

@@ -5019,7 +5019,7 @@ TEST_F(LayerTreeHostImplTest, ScrollChildBeyondLimit) {

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl_->active_tree(), 1);

root->SetBounds(surface_size);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

std::unique_ptr<LayerImpl> grand_child =

CreateScrollableLayer(3, content_size, root.get());

@@ -5076,7 +5076,7 @@ TEST_F(LayerTreeHostImplTest, ScrollWithoutBubbling) {

LayerImpl::Create(host_impl_->active_tree(), 1);

std::unique_ptr<LayerImpl> root_clip =

LayerImpl::Create(host_impl_->active_tree(), 2);

- root_clip->SetForceRenderSurface(true);

+ root_clip->test_properties()->force_render_surface = true;

std::unique_ptr<LayerImpl> root_scrolling =

CreateScrollableLayer(3, surface_size, root_clip.get());

root_scrolling->SetIsContainerForFixedPositionLayers(true);

@@ -5208,7 +5208,7 @@ TEST_F(LayerTreeHostImplTest, ScrollEventBubbling) {

LayerImpl::Create(host_impl_->active_tree(), 4);

std::unique_ptr<LayerImpl> root_clip =

LayerImpl::Create(host_impl_->active_tree(), 3);

- root_clip->SetForceRenderSurface(true);

+ root_clip->test_properties()->force_render_surface = true;

std::unique_ptr<LayerImpl> root_scroll =

CreateScrollableLayer(1, content_size, root_clip.get());

// Make 'root' the clip layer for child: since they have the same sizes the

@@ -5258,7 +5258,7 @@ TEST_F(LayerTreeHostImplTest, ScrollBeforeRedraw) {

std::unique_ptr<LayerImpl> root_scroll =

CreateScrollableLayer(3, surface_size, root_clip.get());

root_scroll->SetIsContainerForFixedPositionLayers(true);

- root_clip->SetForceRenderSurface(true);

+ root_clip->test_properties()->force_render_surface = true;

root_clip->AddChild(std::move(root_scroll));

root_ptr->AddChild(std::move(root_clip));

host_impl_->active_tree()->SetRootLayer(std::move(root_ptr));

@@ -5280,7 +5280,7 @@ TEST_F(LayerTreeHostImplTest, ScrollBeforeRedraw) {

CreateScrollableLayer(6, surface_size, root_clip2.get());

root_scroll2->SetIsContainerForFixedPositionLayers(true);

root_clip2->AddChild(std::move(root_scroll2));

- root_clip2->SetForceRenderSurface(true);

+ root_clip2->test_properties()->force_render_surface = true;

root_ptr2->AddChild(std::move(root_clip2));

host_impl_->active_tree()->SetRootLayer(std::move(root_ptr2));

host_impl_->active_tree()->SetViewportLayersFromIds(Layer::INVALID_ID, 4, 6,

@@ -5907,7 +5907,7 @@ TEST_F(LayerTreeHostImplTest, OverscrollChildWithoutBubbling) {

gfx::Size surface_size(10, 10);

std::unique_ptr<LayerImpl> root_clip =

LayerImpl::Create(host_impl_->active_tree(), 4);

- root_clip->SetForceRenderSurface(true);

+ root_clip->test_properties()->force_render_surface = true;

std::unique_ptr<LayerImpl> root =

CreateScrollableLayer(1, surface_size, root_clip.get());

@@ -6196,7 +6196,7 @@ TEST_F(LayerTreeHostImplTest, BlendingOffWhenDrawingOpaqueLayers) {

LayerImpl::Create(host_impl_->active_tree(), 1);

root->SetBounds(gfx::Size(10, 10));

root->SetDrawsContent(false);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

host_impl_->active_tree()->SetRootLayer(std::move(root));

}

LayerImpl* root = host_impl_->active_tree()->root_layer();

@@ -6318,7 +6318,7 @@ TEST_F(LayerTreeHostImplTest, BlendingOffWhenDrawingOpaqueLayers) {

layer1->SetContentsOpaque(true);

layer1->SetOpacity(0.5f);

layer1->NoteLayerPropertyChanged();

- layer1->SetForceRenderSurface(true);

+ layer1->test_properties()->force_render_surface = true;

layer1->SetExpectation(false, true);

layer1->SetUpdateRect(gfx::Rect(layer1->bounds()));

layer2->SetExpectation(false, false);

@@ -6331,7 +6331,7 @@ TEST_F(LayerTreeHostImplTest, BlendingOffWhenDrawingOpaqueLayers) {

EXPECT_TRUE(layer1->quads_appended());

EXPECT_TRUE(layer2->quads_appended());

host_impl_->DidDrawAllLayers(frame);

- layer1->SetForceRenderSurface(false);

+ layer1->test_properties()->force_render_surface = false;

// Draw again, but with child non-opaque, to make sure

// layer1 not culled.

@@ -6462,7 +6462,10 @@ class LayerTreeHostImplViewportCoveredTest : public LayerTreeHostImplTest {

host_impl_->active_tree()->set_background_color(SK_ColorGRAY);

host_impl_->active_tree()->SetRootLayer(

LayerImpl::Create(host_impl_->active_tree(), 1));

- host_impl_->active_tree()->root_layer()->SetForceRenderSurface(true);

+ host_impl_->active_tree()

+ ->root_layer()

+ ->test_properties()

+ ->force_render_surface = true;

host_impl_->active_tree()->root_layer()->AddChild(

BlendStateCheckLayer::Create(host_impl_->active_tree(),

@@ -6765,7 +6768,7 @@ TEST_F(LayerTreeHostImplTest, ReshapeNotCalledUntilDraw) {

FakeDrawableLayerImpl::Create(host_impl_->active_tree(), 1);

root->SetBounds(gfx::Size(10, 10));

root->SetDrawsContent(true);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

host_impl_->active_tree()->SetRootLayer(std::move(root));

EXPECT_FALSE(provider->TestContext3d()->reshape_called());

provider->TestContext3d()->clear_reshape_called();

@@ -6831,7 +6834,7 @@ TEST_F(LayerTreeHostImplTest, PartialSwapReceivesDamageRect) {

std::unique_ptr<LayerImpl> root =

FakeDrawableLayerImpl::Create(layer_tree_host_impl->active_tree(), 1);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

std::unique_ptr<LayerImpl> child =

FakeDrawableLayerImpl::Create(layer_tree_host_impl->active_tree(), 2);

child->SetPosition(gfx::PointF(12.f, 13.f));

@@ -6901,7 +6904,7 @@ TEST_F(LayerTreeHostImplTest, RootLayerDoesntCreateExtraSurface) {

child->SetDrawsContent(true);

root->SetBounds(gfx::Size(10, 10));

root->SetDrawsContent(true);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

root->AddChild(std::move(child));

host_impl_->active_tree()->SetRootLayer(std::move(root));

@@ -7153,7 +7156,7 @@ static std::unique_ptr<LayerTreeHostImpl> SetupLayersForOpacity(

gfx::Rect child_rect(10, 10, 50, 50);

gfx::Rect grand_child_rect(5, 5, 150, 150);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

root->SetPosition(gfx::PointF(root_rect.origin()));

root->SetBounds(root_rect.size());

root->draw_properties().visible_layer_rect = root_rect;

@@ -7164,7 +7167,7 @@ static std::unique_ptr<LayerTreeHostImpl> SetupLayersForOpacity(

child->SetBounds(gfx::Size(child_rect.width(), child_rect.height()));

child->draw_properties().visible_layer_rect = child_rect;

child->SetDrawsContent(false);

- child->SetForceRenderSurface(true);

+ child->test_properties()->force_render_surface = true;

grand_child->SetPosition(gfx::PointF(grand_child_rect.origin()));

grand_child->SetBounds(grand_child_rect.size());

@@ -7250,7 +7253,7 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {

std::unique_ptr<LayerImpl> root_layer =

LayerImpl::Create(host_impl_->active_tree(), 1);

root_layer->SetBounds(gfx::Size(10, 10));

- root_layer->SetForceRenderSurface(true);

+ root_layer->test_properties()->force_render_surface = true;

scoped_refptr<VideoFrame> softwareFrame =

media::VideoFrame::CreateColorFrame(

@@ -7375,7 +7378,7 @@ TEST_F(LayerTreeHostImplTestWithDelegatingRenderer, FrameIncludesDamageRect) {

root->SetPosition(gfx::PointF());

root->SetBounds(gfx::Size(10, 10));

root->SetDrawsContent(true);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

// Child layer is in the bottom right corner.

std::unique_ptr<SolidColorLayerImpl> child =

@@ -7432,7 +7435,7 @@ TEST_F(LayerTreeHostImplTest, FarAwayQuadsDontNeedAA) {

std::unique_ptr<LayerImpl> scoped_root =

LayerImpl::Create(host_impl_->pending_tree(), 1);

LayerImpl* root = scoped_root.get();

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

host_impl_->pending_tree()->SetRootLayer(std::move(scoped_root));

@@ -7807,7 +7810,7 @@ TEST_F(LayerTreeHostImplTest, TouchFlingShouldNotBubble) {

LayerImpl::Create(host_impl_->active_tree(), 4);

std::unique_ptr<LayerImpl> root_clip =

LayerImpl::Create(host_impl_->active_tree(), 3);

- root_clip->SetForceRenderSurface(true);

+ root_clip->test_properties()->force_render_surface = true;

std::unique_ptr<LayerImpl> root_scroll =

CreateScrollableLayer(1, content_size, root_clip.get());

@@ -7858,7 +7861,7 @@ TEST_F(LayerTreeHostImplTest, TouchFlingShouldContinueScrollingCurrentLayer) {

gfx::Size surface_size(10, 10);

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl_->active_tree(), 1);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

std::unique_ptr<LayerImpl> root_scrolling =

CreateScrollableLayer(2, surface_size, root.get());

@@ -7947,7 +7950,7 @@ TEST_F(LayerTreeHostImplTest, WheelFlingShouldntBubble) {

gfx::Size content_size(20, 20);

std::unique_ptr<LayerImpl> root_clip =

LayerImpl::Create(host_impl_->active_tree(), 3);

- root_clip->SetForceRenderSurface(true);

+ root_clip->test_properties()->force_render_surface = true;

std::unique_ptr<LayerImpl> root_scroll =

CreateScrollableLayer(1, content_size, root_clip.get());

int root_scroll_id = root_scroll->id();

@@ -8202,7 +8205,7 @@ TEST_F(LayerTreeHostImplTest, LatencyInfoPassedToCompositorFrameMetadata) {

root->SetPosition(gfx::PointF());

root->SetBounds(gfx::Size(10, 10));

root->SetDrawsContent(true);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

host_impl_->active_tree()->SetRootLayer(std::move(root));

@@ -8242,7 +8245,7 @@ TEST_F(LayerTreeHostImplTest, SelectionBoundsPassedToCompositorFrameMetadata) {

root->SetPosition(gfx::PointF());

root->SetBounds(gfx::Size(10, 10));

root->SetDrawsContent(true);

- root->SetForceRenderSurface(true);

+ root->test_properties()->force_render_surface = true;

host_impl_->active_tree()->SetRootLayer(std::move(root));

@@ -8938,7 +8941,7 @@ class LayerTreeHostImplVirtualViewportTest : public LayerTreeHostImplTest {

page_scale->AddChild(std::move(inner_scroll));

inner_clip->AddChild(std::move(page_scale));

- inner_clip->SetForceRenderSurface(true);

+ inner_clip->test_properties()->force_render_surface = true;

layer_tree_impl->SetRootLayer(std::move(inner_clip));

layer_tree_impl->SetViewportLayersFromIds(

Layer::INVALID_ID, kPageScaleLayerId, kInnerViewportScrollLayerId,

@@ -9541,7 +9544,7 @@ TEST_F(LayerTreeHostImplTest, ExternalTransformAffectsSublayerScaleFactor) {

host_impl_->active_tree()->OuterViewportScrollLayer()->children()[0];

content_layer->AddChild(LayerImpl::Create(host_impl_->active_tree(), 100));

LayerImpl* test_layer = host_impl_->active_tree()->LayerById(100);

- test_layer->SetForceRenderSurface(true);

+ test_layer->test_properties()->force_render_surface = true;

test_layer->SetDrawsContent(true);

test_layer->SetBounds(layer_size);

gfx::Transform perspective_transform;

@@ -10591,7 +10594,8 @@ TEST_F(LayerTreeHostImplTest, SubLayerScaleForNodeInSubtreeOfPageScaleLayer) {

LayerImpl* in_subtree_of_page_scale_layer =

host_impl_->active_tree()->LayerById(100);

- in_subtree_of_page_scale_layer->SetForceRenderSurface(true);

+ in_subtree_of_page_scale_layer->test_properties()->force_render_surface =

+ true;

SetNeedsRebuildPropertyTrees();

RebuildPropertyTrees();

DrawFrame();