Revert of Create RenderSurface on Effect Tree

cc/trees/occlusion_tracker_unittest.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/occlusion_tracker.h"
 
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 88 matching lines @@
                                    const gfx::Size& bounds) {
     LayerTreeImpl* tree = host_->host_impl()->active_tree();
     int id = next_layer_impl_id_++;
     scoped_ptr<TestContentLayerImpl> layer(new TestContentLayerImpl(tree, id));
     TestContentLayerImpl* layer_ptr = layer.get();
     SetProperties(layer_ptr, transform, position, bounds);
 
     DCHECK(!root_.get());
     root_ = std::move(layer);
 
-    layer_ptr->SetForceRenderSurface(true);
+    layer_ptr->SetHasRenderSurface(true);
     SetRootLayerOnMainThread(layer_ptr);
 
     return layer_ptr;
   }
 
   LayerImpl* CreateLayer(LayerImpl* parent,
                          const gfx::Transform& transform,
                          const gfx::PointF& position,
                          const gfx::Size& bounds) {
     LayerTreeImpl* tree = host_->host_impl()->active_tree();
     int id = next_layer_impl_id_++;
     scoped_ptr<LayerImpl> layer = LayerImpl::Create(tree, id);
     LayerImpl* layer_ptr = layer.get();
     SetProperties(layer_ptr, transform, position, bounds);
     parent->AddChild(std::move(layer));
     return layer_ptr;
   }
 
   LayerImpl* CreateSurface(LayerImpl* parent,
                            const gfx::Transform& transform,
                            const gfx::PointF& position,
                            const gfx::Size& bounds) {
     LayerImpl* layer = CreateLayer(parent, transform, position, bounds);
-    layer->SetForceRenderSurface(true);
+    layer->SetHasRenderSurface(true);
     return layer;
   }
 
   TestContentLayerImpl* CreateDrawingLayer(LayerImpl* parent,
                                            const gfx::Transform& transform,
                                            const gfx::PointF& position,
                                            const gfx::Size& bounds,
                                            bool opaque) {
     LayerTreeImpl* tree = host_->host_impl()->active_tree();
     int id = next_layer_impl_id_++;
@@ skipping 38 matching lines @@
     return layer_ptr;
   }
 
   TestContentLayerImpl* CreateDrawingSurface(LayerImpl* parent,
                                              const gfx::Transform& transform,
                                              const gfx::PointF& position,
                                              const gfx::Size& bounds,
                                              bool opaque) {
     TestContentLayerImpl* layer =
         CreateDrawingLayer(parent, transform, position, bounds, opaque);
-    layer->SetForceRenderSurface(true);
+    layer->SetHasRenderSurface(true);
     return layer;
   }
 
   void DestroyLayers() {
     root_ = nullptr;
     render_surface_layer_list_impl_.clear();
     replica_layers_.clear();
     mask_layers_.clear();
     ResetLayerIterator();
   }
 
   void CopyOutputCallback(scoped_ptr<CopyOutputResult> result) {}
 
   void AddCopyRequest(Layer* layer) {
     layer->RequestCopyOfOutput(CopyOutputRequest::CreateBitmapRequest(
         base::Bind(&OcclusionTrackerTest::CopyOutputCallback,
                    base::Unretained(this))));
   }
 
   void AddCopyRequest(LayerImpl* layer) {
     std::vector<scoped_ptr<CopyOutputRequest>> requests;
     requests.push_back(CopyOutputRequest::CreateBitmapRequest(base::Bind(
         &OcclusionTrackerTest::CopyOutputCallback, base::Unretained(this))));
+    layer->SetHasRenderSurface(true);
     layer->PassCopyRequests(&requests);
   }
 
   void CalcDrawEtc(TestContentLayerImpl* root) {
     DCHECK(root == root_.get());
 
     // These occlusion tests attach and detach layers in multiple
     // iterations, so rebuild property trees every time.
     root->layer_tree_impl()->property_trees()->needs_rebuild = true;
 
@@ skipping 302 matching lines @@
       : OcclusionTrackerTest(opaque_layers) {}
 
   void RunMyTest() override {
     TestContentLayerImpl* parent = this->CreateRoot(
         this->identity_matrix, gfx::PointF(), gfx::Size(200, 200));
 
     gfx::Transform layer1_matrix;
     layer1_matrix.Scale(2.0, 2.0);
     TestContentLayerImpl* layer1 = this->CreateDrawingLayer(
         parent, layer1_matrix, gfx::PointF(), gfx::Size(100, 100), true);
-    layer1->SetForceRenderSurface(true);
+    layer1->SetHasRenderSurface(true);
 
     gfx::Transform layer2_matrix;
     layer2_matrix.Translate(25.0, 25.0);
     TestContentLayerImpl* layer2 = this->CreateDrawingLayer(
         layer1, layer2_matrix, gfx::PointF(), gfx::Size(50, 50), true);
     TestContentLayerImpl* occluder = this->CreateDrawingLayer(
         parent, this->identity_matrix, gfx::PointF(100.f, 100.f),
         gfx::Size(500, 500), true);
     this->CalcDrawEtc(parent);
 
@@ skipping 360 matching lines @@
     TestContentLayerImpl* blur_layer = this->CreateDrawingLayer(
         parent, layer_transform, gfx::PointF(30.f, 30.f), gfx::Size(500, 500),
         true);
     TestContentLayerImpl* opaque_layer = this->CreateDrawingLayer(
         parent, layer_transform, gfx::PointF(30.f, 30.f), gfx::Size(500, 500),
         true);
     TestContentLayerImpl* opacity_layer = this->CreateDrawingLayer(
         parent, layer_transform, gfx::PointF(30.f, 30.f), gfx::Size(500, 500),
         true);
 
-    blur_layer->SetForceRenderSurface(true);
+    blur_layer->SetHasRenderSurface(true);
     FilterOperations filters;
     filters.Append(FilterOperation::CreateBlurFilter(10.f));
     blur_layer->SetFilters(filters);
 
-    opaque_layer->SetForceRenderSurface(true);
+    opaque_layer->SetHasRenderSurface(true);
     filters.Clear();
     filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f));
     opaque_layer->SetFilters(filters);
 
-    opacity_layer->SetForceRenderSurface(true);
+    opacity_layer->SetHasRenderSurface(true);
     filters.Clear();
     filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
     opacity_layer->SetFilters(filters);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip occlusion(gfx::Rect(0, 0, 1000, 1000));
 
     // Opacity layer won't contribute to occlusion.
     this->VisitLayer(opacity_layer, &occlusion);
@@ skipping 511 matching lines @@
 
       // Make a 50x50 filtered surface that is adjacent to occluding layers
       // which are above it in the z-order in various configurations. The
       // surface is scaled to test that the pixel moving is done in the target
       // space, where the background filter is applied.
       TestContentLayerImpl* parent = this->CreateRoot(
           this->identity_matrix, gfx::PointF(), gfx::Size(200, 200));
       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) {
         case LEFT:
           occlusion_rect = gfx::Rect(0, 0, 50, 200);
           break;
         case RIGHT:
           occlusion_rect = gfx::Rect(100, 0, 50, 200);
           break;
         case TOP:
           occlusion_rect = gfx::Rect(0, 0, 200, 50);
           break;
         case BOTTOM:
           occlusion_rect = gfx::Rect(0, 100, 200, 50);
           break;
       }
 
       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));
 
       // This layer occludes pixels directly beside the filtered_surface.
       // Because filtered surface blends pixels in a radius, it will need to see
       // some of the pixels (up to radius far) underneath the occluding layers.
       this->VisitLayer(occluding_layer, &occlusion);
 
       EXPECT_EQ(occlusion_rect.ToString(),
@@ skipping 63 matching lines @@
     parent->SetMasksToBounds(true);
     LayerImpl* filtered_surface1 = this->CreateDrawingLayer(
         parent, scale_by_half, gfx::PointF(), gfx::Size(300, 300), false);
     LayerImpl* filtered_surface2 = this->CreateDrawingLayer(
         parent, scale_by_half, gfx::PointF(), gfx::Size(300, 300), false);
     LayerImpl* occluding_layer_above = this->CreateDrawingLayer(
         parent, this->identity_matrix, gfx::PointF(100.f, 100.f),
         gfx::Size(50, 50), true);
 
     // Filters make the layers own surfaces.
-    filtered_surface1->SetForceRenderSurface(true);
-    filtered_surface2->SetForceRenderSurface(true);
+    filtered_surface1->SetHasRenderSurface(true);
+    filtered_surface2->SetHasRenderSurface(true);
     FilterOperations filters;
     filters.Append(FilterOperation::CreateBlurFilter(1.f));
     filtered_surface1->SetBackgroundFilters(filters);
     filtered_surface2->SetBackgroundFilters(filters);
 
     // Save the distance of influence for the blur effect.
     int outset_top, outset_right, outset_bottom, outset_left;
     filters.GetOutsets(
         &outset_top, &outset_right, &outset_bottom, &outset_left);
 
@@ skipping 55 matching lines @@
         gfx::Size(30, 30), true);
     LayerImpl* filtered_surface =
         this->CreateDrawingLayer(parent, scale_by_half, gfx::PointF(50.f, 50.f),
                                  gfx::Size(100, 100), false);
     this->CreateReplicaLayer(filtered_surface,
                              this->identity_matrix,
                              gfx::PointF(300.f, 0.f),
                              gfx::Size());
 
     // Filters make the layer own a surface.
-    filtered_surface->SetForceRenderSurface(true);
+    filtered_surface->SetHasRenderSurface(true);
     FilterOperations filters;
     filters.Append(FilterOperation::CreateBlurFilter(3.f));
     filtered_surface->SetBackgroundFilters(filters);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip occlusion(gfx::Rect(0, 0, 1000, 1000));
 
     // The surface has a background blur, so it blurs non-opaque pixels below
     // it.
@@ skipping 46 matching lines @@
     TestContentLayerImpl* parent = this->CreateRoot(
         this->identity_matrix, gfx::PointF(), gfx::Size(200, 150));
     LayerImpl* filtered_surface =
         this->CreateDrawingLayer(parent, scale_by_half, gfx::PointF(50.f, 50.f),
                                  gfx::Size(100, 100), false);
     LayerImpl* occluding_layer = this->CreateDrawingLayer(
         parent, this->identity_matrix, gfx::PointF(50.f, 50.f),
         gfx::Size(50, 50), true);
 
     // Filters make the layer own a surface.
-    filtered_surface->SetForceRenderSurface(true);
+    filtered_surface->SetHasRenderSurface(true);
     FilterOperations filters;
     filters.Append(FilterOperation::CreateBlurFilter(3.f));
     filtered_surface->SetBackgroundFilters(filters);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip occlusion(gfx::Rect(0, 0, 1000, 1000));
 
     this->VisitLayer(occluding_layer, &occlusion);
 
@@ skipping 58 matching lines @@
         parent, this->identity_matrix, gfx::PointF(200.f, 50.f),
         gfx::Size(30, 50), true);
     LayerImpl* beside_surface_layer = this->CreateDrawingLayer(
         parent, this->identity_matrix, gfx::PointF(90.f, 40.f),
         gfx::Size(10, 10), true);
     LayerImpl* beside_replica_layer = this->CreateDrawingLayer(
         parent, this->identity_matrix, gfx::PointF(200.f, 40.f),
         gfx::Size(10, 10), true);
 
     // Filters make the layer own a surface.
-    filtered_surface->SetForceRenderSurface(true);
+    filtered_surface->SetHasRenderSurface(true);
     FilterOperations filters;
     filters.Append(FilterOperation::CreateBlurFilter(3.f));
     filtered_surface->SetBackgroundFilters(filters);
 
     // Save the distance of influence for the blur effect.
     int outset_top, outset_right, outset_bottom, outset_left;
     filters.GetOutsets(
         &outset_top, &outset_right, &outset_bottom, &outset_left);
 
     this->CalcDrawEtc(parent);
@@ skipping 54 matching lines @@
     TestContentLayerImpl* parent = this->CreateRoot(
         this->identity_matrix, gfx::PointF(), gfx::Size(100, 100));
     LayerImpl* blend_mode_layer = this->CreateDrawingLayer(
         parent, this->identity_matrix, gfx::PointF(0.f, 0.f),
         gfx::Size(100, 100), true);
     LayerImpl* top_layer = this->CreateDrawingLayer(
         parent, this->identity_matrix, gfx::PointF(10.f, 12.f),
         gfx::Size(20, 22), true);
 
     // Blend mode makes the layer own a surface.
-    blend_mode_layer->SetForceRenderSurface(true);
+    blend_mode_layer->SetHasRenderSurface(true);
     blend_mode_layer->SetBlendMode(SkXfermode::kMultiply_Mode);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip occlusion(gfx::Rect(0, 0, 1000, 1000));
 
     this->VisitLayer(top_layer, &occlusion);
     // |top_layer| occludes.
     EXPECT_EQ(gfx::Rect(10, 12, 20, 22).ToString(),
               occlusion.occlusion_from_inside_target().ToString());
@@ skipping 637 matching lines @@
     EXPECT_EQ(gfx::Rect(),
               occlusion.UnoccludedSurfaceContentRect(
                   surface, gfx::Rect(80, 70, 50, 50)));
   }
 };
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestUnoccludedSurfaceQuery)
 
 }  // namespace
 }  // namespace cc