Revert of Optimize render passes with single quads

cc/trees/layer_tree_host_pixeltest_masks.cc

 // Copyright 2013 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 <stddef.h>
 
 #include "build/build_config.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_image_layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/test/layer_tree_pixel_resource_test.h"
 #include "cc/test/pixel_comparator.h"
-#include "cc/test/solid_color_content_layer_client.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
 #if !defined(OS_ANDROID)
 
 namespace cc {
 namespace {
 
 typedef ParameterizedPixelResourceTest LayerTreeHostMasksPixelTest;
@@ skipping 145 matching lines @@
   scoped_refptr<Layer> replica = Layer::Create();
   replica->SetTransformOrigin(gfx::Point3F(25.f, 25.f, 0.f));
   replica->SetPosition(gfx::PointF(50.f, 50.f));
   replica->SetTransform(replica_transform);
   green->SetReplicaLayer(replica.get());
 
   RunPixelResourceTest(
       background, base::FilePath(FILE_PATH_LITERAL("mask_with_replica.png")));
 }
 
-// Test collapsing of render passes containing a single tile quad and
-// drawing them directly with masks and replicas.
-TEST_P(LayerTreeHostMasksPixelTest, ContentLayerMaskWithReplica) {
-  scoped_refptr<SolidColorLayer> background =
-      CreateSolidColorLayer(gfx::Rect(100, 100), SK_ColorWHITE);
-
-  gfx::Size mask_bounds(50, 50);
-  MaskContentLayerClient client(mask_bounds);
-  scoped_refptr<PictureLayer> mask = PictureLayer::Create(&client);
-  mask->SetBounds(mask_bounds);
-  mask->SetIsDrawable(true);
-  mask->SetIsMask(true);
-
-  // Use a border to defeat solid color detection to force a tile quad.
-  SolidColorContentLayerClient green_client(kCSSGreen, mask_bounds, 1,
-                                            SK_ColorBLACK);
-  scoped_refptr<PictureLayer> green = PictureLayer::Create(&green_client);
-  green->SetBounds(mask_bounds);
-  green->SetIsDrawable(true);
-  background->AddChild(green);
-  green->SetMaskLayer(mask.get());
-
-  gfx::Transform replica_transform;
-  replica_transform.Rotate(-90.0);
-
-  scoped_refptr<Layer> replica = Layer::Create();
-  replica->SetTransformOrigin(gfx::Point3F(25.f, 25.f, 0.f));
-  replica->SetPosition(gfx::PointF(50.f, 50.f));
-  replica->SetTransform(replica_transform);
-  green->SetReplicaLayer(replica.get());
-
-  RunPixelResourceTest(
-      background, base::FilePath(FILE_PATH_LITERAL("mask_with_replica.png")));
-}
-
 TEST_P(LayerTreeHostMasksPixelTest, MaskWithReplicaOfClippedLayer) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
       gfx::Rect(100, 100), SK_ColorWHITE);
 
   gfx::Size mask_bounds(50, 50);
   MaskContentLayerClient client(mask_bounds);
   scoped_refptr<PictureLayer> mask = PictureLayer::Create(&client);
   mask->SetBounds(mask_bounds);
   mask->SetIsDrawable(true);
   mask->SetIsMask(true);
@@ skipping 291 matching lines @@
 
   RunPixelResourceTest(background,
                        base::FilePath(
                            FILE_PATH_LITERAL("mask_of_layer_with_blend.png")));
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // !defined(OS_ANDROID)