Update from https://crrev.com/309717

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 109 matching lines @@
   static ContentLayerPtrType CreateContentLayer(HostType* host) {
     return make_scoped_refptr(new ContentLayerType());
   }
 
   template <typename T>
   static LayerPtrType PassLayerPtr(T* layer) {
     LayerPtrType ref(*layer);
     *layer = NULL;
     return ref;
   }
+  static void SetForceRenderSurface(LayerType* layer, bool force) {
+    layer->SetForceRenderSurface(force);
+  }
 
   static void DestroyLayer(LayerPtrType* layer) { *layer = NULL; }
 
   static void RecursiveUpdateNumChildren(LayerType* layerType) {}
 };
 
 struct OcclusionTrackerTestImplThreadTypes {
   typedef LayerImpl LayerType;
   typedef LayerTreeImpl HostType;
   typedef RenderSurfaceImpl RenderSurfaceType;
   typedef TestContentLayerImpl ContentLayerType;
   typedef scoped_ptr<LayerImpl> LayerPtrType;
   typedef scoped_ptr<ContentLayerType> ContentLayerPtrType;
   typedef LayerIterator<LayerImpl> TestLayerIterator;
   typedef OcclusionTracker<LayerImpl> OcclusionTrackerType;
 
   static LayerPtrType CreateLayer(HostType* host) {
     return LayerImpl::Create(host, next_layer_impl_id++);
   }
   static ContentLayerPtrType CreateContentLayer(HostType* host) {
     return make_scoped_ptr(new ContentLayerType(host, next_layer_impl_id++));
   }
   static int next_layer_impl_id;
 
   template <typename T>
   static LayerPtrType PassLayerPtr(T* layer) {
     return layer->Pass();
   }
 
+  static void SetForceRenderSurface(LayerType* layer, bool force) {
+    layer->SetHasRenderSurface(force);
+  }
   static void DestroyLayer(LayerPtrType* layer) { layer->reset(); }
 
   static void RecursiveUpdateNumChildren(LayerType* layer) {
     FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(layer);
   }
 };
 
 int OcclusionTrackerTestImplThreadTypes::next_layer_impl_id = 1;
 
 template <typename Types> class OcclusionTrackerTest : public testing::Test {
@@ skipping 13 matching lines @@
                                                const gfx::PointF& position,
                                                const gfx::Size& bounds) {
     typename Types::ContentLayerPtrType layer(
         Types::CreateContentLayer(GetHost()));
     typename Types::ContentLayerType* layer_ptr = layer.get();
     SetProperties(layer_ptr, transform, position, bounds);
 
     DCHECK(!root_.get());
     root_ = Types::PassLayerPtr(&layer);
 
+    Types::SetForceRenderSurface(layer_ptr, true);
     SetRootLayerOnMainThread(layer_ptr);
 
     return layer_ptr;
   }
 
   typename Types::LayerType* CreateLayer(typename Types::LayerType* parent,
                                          const gfx::Transform& transform,
                                          const gfx::PointF& position,
                                          const gfx::Size& bounds) {
     typename Types::LayerPtrType layer(Types::CreateLayer(GetHost()));
     typename Types::LayerType* layer_ptr = layer.get();
     SetProperties(layer_ptr, transform, position, bounds);
     parent->AddChild(Types::PassLayerPtr(&layer));
     return layer_ptr;
   }
 
   typename Types::LayerType* CreateSurface(typename Types::LayerType* parent,
                                            const gfx::Transform& transform,
                                            const gfx::PointF& position,
                                            const gfx::Size& bounds) {
     typename Types::LayerType* layer =
         CreateLayer(parent, transform, position, bounds);
-    layer->SetForceRenderSurface(true);
+    Types::SetForceRenderSurface(layer, true);
     return layer;
   }
 
   typename Types::ContentLayerType* CreateDrawingLayer(
       typename Types::LayerType* parent,
       const gfx::Transform& transform,
       const gfx::PointF& position,
       const gfx::Size& bounds,
       bool opaque) {
     typename Types::ContentLayerPtrType layer(
@@ skipping 40 matching lines @@
   }
 
   typename Types::ContentLayerType* CreateDrawingSurface(
       typename Types::LayerType* parent,
       const gfx::Transform& transform,
       const gfx::PointF& position,
       const gfx::Size& bounds,
       bool opaque) {
     typename Types::ContentLayerType* layer =
         CreateDrawingLayer(parent, transform, position, bounds, opaque);
-    layer->SetForceRenderSurface(true);
+    Types::SetForceRenderSurface(layer, true);
     return layer;
   }
 
   void DestroyLayers() {
     Types::DestroyLayer(&root_);
     render_surface_layer_list_ = 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<Types>::CopyOutputCallback,
             base::Unretained(this))));
   }
 
   void AddCopyRequest(LayerImpl* layer) {
     ScopedPtrVector<CopyOutputRequest> requests;
     requests.push_back(
         CopyOutputRequest::CreateBitmapRequest(base::Bind(
             &OcclusionTrackerTest<Types>::CopyOutputCallback,
             base::Unretained(this))));
+    layer->SetHasRenderSurface(true);
     layer->PassCopyRequests(&requests);
   }
 
   void CalcDrawEtc(TestContentLayerImpl* root) {
     DCHECK(root == root_.get());
-    DCHECK(!root->render_surface());
 
     Types::RecursiveUpdateNumChildren(root);
     LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
         root, root->bounds(), &render_surface_layer_list_impl_);
     inputs.can_adjust_raster_scales = true;
     LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 
     layer_iterator_ = layer_iterator_begin_ =
         Types::TestLayerIterator::Begin(&render_surface_layer_list_impl_);
   }
@@ skipping 408 matching lines @@
       : OcclusionTrackerTest<Types>(opaque_layers) {}
 
   void RunMyTest() override {
     typename Types::ContentLayerType* parent = this->CreateRoot(
         this->identity_matrix, gfx::PointF(), gfx::Size(200, 200));
 
     gfx::Transform layer1_matrix;
     layer1_matrix.Scale(2.0, 2.0);
     typename Types::ContentLayerType* layer1 = this->CreateDrawingLayer(
         parent, layer1_matrix, gfx::PointF(), gfx::Size(100, 100), true);
-    layer1->SetForceRenderSurface(true);
+    Types::SetForceRenderSurface(layer1, true);
 
     gfx::Transform layer2_matrix;
     layer2_matrix.Translate(25.0, 25.0);
     typename Types::ContentLayerType* layer2 = this->CreateDrawingLayer(
         layer1, layer2_matrix, gfx::PointF(), gfx::Size(50, 50), true);
     typename Types::ContentLayerType* occluder =
         this->CreateDrawingLayer(parent,
                                  this->identity_matrix,
                                  gfx::PointF(100.f, 100.f),
                                  gfx::Size(500, 500),
@@ skipping 93 matching lines @@
     child_transform.Rotate(95.0);
     child_transform.Translate(-250.0, -250.0);
 
     gfx::Transform layer_transform;
     layer_transform.Translate(10.0, 10.0);
 
     typename Types::ContentLayerType* root = this->CreateRoot(
         this->identity_matrix, gfx::PointF(), gfx::Size(1000, 1000));
     typename Types::ContentLayerType* parent = this->CreateDrawingLayer(
         root, this->identity_matrix, gfx::PointF(), gfx::Size(100, 100), true);
-    typename Types::LayerType* child = this->CreateLayer(
+    typename Types::LayerType* child = this->CreateSurface(
         parent, child_transform, gfx::PointF(30.f, 30.f), gfx::Size(500, 500));
-    child->SetMasksToBounds(true);
     typename Types::ContentLayerType* layer = this->CreateDrawingLayer(
         child, layer_transform, gfx::PointF(), gfx::Size(500, 500), true);
     this->CalcDrawEtc(root);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     gfx::Rect clipped_layer_in_child = MathUtil::MapEnclosingClippedRect(
         layer_transform, layer->visible_content_rect());
 
@@ skipping 298 matching lines @@
                                  gfx::PointF(30.f, 30.f),
                                  gfx::Size(500, 500),
                                  true);
     typename Types::ContentLayerType* opacity_layer =
         this->CreateDrawingLayer(parent,
                                  layer_transform,
                                  gfx::PointF(30.f, 30.f),
                                  gfx::Size(500, 500),
                                  true);
 
+    Types::SetForceRenderSurface(blur_layer, true);
     FilterOperations filters;
     filters.Append(FilterOperation::CreateBlurFilter(10.f));
     blur_layer->SetFilters(filters);
 
+    Types::SetForceRenderSurface(opaque_layer, true);
     filters.Clear();
     filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f));
     opaque_layer->SetFilters(filters);
 
+    Types::SetForceRenderSurface(opacity_layer, true);
     filters.Clear();
     filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
     opacity_layer->SetFilters(filters);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     // Opacity layer won't contribute to occlusion.
@@ skipping 1032 matching lines @@
       // surface is scaled to test that the pixel moving is done in the target
       // space, where the background filter is applied.
       typename Types::ContentLayerType* parent = this->CreateRoot(
           this->identity_matrix, gfx::PointF(), gfx::Size(200, 200));
       typename Types::LayerType* filtered_surface =
           this->CreateDrawingLayer(parent,
                                    scale_by_half,
                                    gfx::PointF(50.f, 50.f),
                                    gfx::Size(100, 100),
                                    false);
+      Types::SetForceRenderSurface(filtered_surface, 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);
@@ skipping 90 matching lines @@
     typename Types::LayerType* filtered_surface2 = this->CreateDrawingLayer(
         parent, scale_by_half, gfx::PointF(), gfx::Size(300, 300), false);
     typename Types::LayerType* 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.
+    Types::SetForceRenderSurface(filtered_surface1, true);
+    Types::SetForceRenderSurface(filtered_surface2, 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 66 matching lines @@
                                  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.
+    Types::SetForceRenderSurface(filtered_surface, true);
     FilterOperations filters;
     filters.Append(FilterOperation::CreateBlurFilter(3.f));
     filtered_surface->SetBackgroundFilters(filters);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     // The surface has a background blur, so it blurs non-opaque pixels below
@@ skipping 54 matching lines @@
                                  gfx::Size(100, 100),
                                  false);
     typename Types::LayerType* 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.
+    Types::SetForceRenderSurface(filtered_surface, true);
     FilterOperations filters;
     filters.Append(FilterOperation::CreateBlurFilter(3.f));
     filtered_surface->SetBackgroundFilters(filters);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     this->VisitLayer(occluding_layer, &occlusion);
@@ skipping 76 matching lines @@
                                  gfx::Size(10, 10),
                                  true);
     typename Types::LayerType* 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.
+    Types::SetForceRenderSurface(filtered_surface, 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 691 matching lines @@
     EXPECT_EQ(gfx::Rect(),
               occlusion.UnoccludedSurfaceContentRect(
                   surface, gfx::Rect(80, 70, 50, 50)));
   }
 };
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestUnoccludedSurfaceQuery)
 
 }  // namespace
 }  // namespace cc