Index: cc/trees/occlusion_tracker_unittest.cc |
diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc |
index bda7b9824baafa7661ade38d1e8d84a8b0a5c23b..5c658c337c0e2824b73b90494c300a2d7e724d5d 100644 |
--- a/cc/trees/occlusion_tracker_unittest.cc |
+++ b/cc/trees/occlusion_tracker_unittest.cc |
@@ -106,7 +106,7 @@ class OcclusionTrackerTest : public testing::Test { |
DCHECK(!root_.get()); |
root_ = std::move(layer); |
- layer_ptr->SetHasRenderSurface(true); |
+ layer_ptr->SetForceRenderSurface(true); |
SetRootLayerOnMainThread(layer_ptr); |
return layer_ptr; |
@@ -130,7 +130,7 @@ class OcclusionTrackerTest : public testing::Test { |
const gfx::PointF& position, |
const gfx::Size& bounds) { |
LayerImpl* layer = CreateLayer(parent, transform, position, bounds); |
- layer->SetHasRenderSurface(true); |
+ layer->SetForceRenderSurface(true); |
return layer; |
} |
@@ -189,7 +189,7 @@ class OcclusionTrackerTest : public testing::Test { |
bool opaque) { |
TestContentLayerImpl* layer = |
CreateDrawingLayer(parent, transform, position, bounds, opaque); |
- layer->SetHasRenderSurface(true); |
+ layer->SetForceRenderSurface(true); |
return layer; |
} |
@@ -213,7 +213,6 @@ class OcclusionTrackerTest : public testing::Test { |
std::vector<scoped_ptr<CopyOutputRequest>> requests; |
requests.push_back(CopyOutputRequest::CreateBitmapRequest(base::Bind( |
&OcclusionTrackerTest::CopyOutputCallback, base::Unretained(this)))); |
- layer->SetHasRenderSurface(true); |
layer->PassCopyRequests(&requests); |
} |
@@ -536,7 +535,7 @@ class OcclusionTrackerTestScaledRenderSurface : public OcclusionTrackerTest { |
layer1_matrix.Scale(2.0, 2.0); |
TestContentLayerImpl* layer1 = this->CreateDrawingLayer( |
parent, layer1_matrix, gfx::PointF(), gfx::Size(100, 100), true); |
- layer1->SetHasRenderSurface(true); |
+ layer1->SetForceRenderSurface(true); |
gfx::Transform layer2_matrix; |
layer2_matrix.Translate(25.0, 25.0); |
@@ -917,17 +916,17 @@ class OcclusionTrackerTestFilters : public OcclusionTrackerTest { |
parent, layer_transform, gfx::PointF(30.f, 30.f), gfx::Size(500, 500), |
true); |
- blur_layer->SetHasRenderSurface(true); |
+ blur_layer->SetForceRenderSurface(true); |
FilterOperations filters; |
filters.Append(FilterOperation::CreateBlurFilter(10.f)); |
blur_layer->SetFilters(filters); |
- opaque_layer->SetHasRenderSurface(true); |
+ opaque_layer->SetForceRenderSurface(true); |
filters.Clear(); |
filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f)); |
opaque_layer->SetFilters(filters); |
- opacity_layer->SetHasRenderSurface(true); |
+ opacity_layer->SetForceRenderSurface(true); |
filters.Clear(); |
filters.Append(FilterOperation::CreateOpacityFilter(0.5f)); |
opacity_layer->SetFilters(filters); |
@@ -1459,7 +1458,6 @@ class OcclusionTrackerTestDontOccludePixelsNeededForBackgroundFilter |
LayerImpl* filtered_surface = this->CreateDrawingLayer( |
parent, scale_by_half, gfx::PointF(50.f, 50.f), gfx::Size(100, 100), |
false); |
- filtered_surface->SetHasRenderSurface(true); |
filtered_surface->SetBackgroundFilters(filters); |
gfx::Rect occlusion_rect; |
switch (i) { |
@@ -1480,6 +1478,7 @@ class OcclusionTrackerTestDontOccludePixelsNeededForBackgroundFilter |
LayerImpl* occluding_layer = this->CreateDrawingLayer( |
parent, this->identity_matrix, gfx::PointF(occlusion_rect.origin()), |
occlusion_rect.size(), true); |
+ occluding_layer->SetForceRenderSurface(false); |
this->CalcDrawEtc(parent); |
TestOcclusionTrackerWithClip occlusion(gfx::Rect(0, 0, 200, 200)); |
@@ -1563,8 +1562,8 @@ class OcclusionTrackerTestTwoBackgroundFiltersReduceOcclusionTwice |
gfx::Size(50, 50), true); |
// Filters make the layers own surfaces. |
- filtered_surface1->SetHasRenderSurface(true); |
- filtered_surface2->SetHasRenderSurface(true); |
+ filtered_surface1->SetForceRenderSurface(true); |
+ filtered_surface2->SetForceRenderSurface(true); |
FilterOperations filters; |
filters.Append(FilterOperation::CreateBlurFilter(1.f)); |
filtered_surface1->SetBackgroundFilters(filters); |
@@ -1640,7 +1639,7 @@ class OcclusionTrackerTestDontReduceOcclusionBelowBackgroundFilter |
gfx::Size()); |
// Filters make the layer own a surface. |
- filtered_surface->SetHasRenderSurface(true); |
+ filtered_surface->SetForceRenderSurface(true); |
FilterOperations filters; |
filters.Append(FilterOperation::CreateBlurFilter(3.f)); |
filtered_surface->SetBackgroundFilters(filters); |
@@ -1707,7 +1706,7 @@ class OcclusionTrackerTestDontReduceOcclusionIfBackgroundFilterIsOccluded |
gfx::Size(50, 50), true); |
// Filters make the layer own a surface. |
- filtered_surface->SetHasRenderSurface(true); |
+ filtered_surface->SetForceRenderSurface(true); |
FilterOperations filters; |
filters.Append(FilterOperation::CreateBlurFilter(3.f)); |
filtered_surface->SetBackgroundFilters(filters); |
@@ -1786,7 +1785,7 @@ class OcclusionTrackerTestReduceOcclusionWhenBkgdFilterIsPartiallyOccluded |
gfx::Size(10, 10), true); |
// Filters make the layer own a surface. |
- filtered_surface->SetHasRenderSurface(true); |
+ filtered_surface->SetForceRenderSurface(true); |
FilterOperations filters; |
filters.Append(FilterOperation::CreateBlurFilter(3.f)); |
filtered_surface->SetBackgroundFilters(filters); |
@@ -1861,7 +1860,7 @@ class OcclusionTrackerTestBlendModeDoesNotOcclude |
gfx::Size(20, 22), true); |
// Blend mode makes the layer own a surface. |
- blend_mode_layer->SetHasRenderSurface(true); |
+ blend_mode_layer->SetForceRenderSurface(true); |
blend_mode_layer->SetBlendMode(SkXfermode::kMultiply_Mode); |
this->CalcDrawEtc(parent); |