Revert: cc: RenderSurfaceImpl tile mask layer.

cc/layers/render_surface_impl_unittest.cc

 // Copyright 2014 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/layers/render_surface_impl.h"
 
 #include <stddef.h>
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/test/fake_mask_layer_impl.h"
-#include "cc/test/fake_raster_source.h"
 #include "cc/test/layer_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 TEST(RenderSurfaceLayerImplTest, Occlusion) {
   gfx::Size layer_size(1000, 1000);
   gfx::Size viewport_size(1000, 1000);
 
@@ skipping 39 matching lines @@
         impl.quad_list(), occluded, &partially_occluded_count);
     // The layer outputs one quad, which is partially occluded.
     EXPECT_EQ(1u, impl.quad_list().size());
     EXPECT_EQ(1u, partially_occluded_count);
   }
 }
 
 TEST(RenderSurfaceLayerImplTest, AppendQuadsWithScaledMask) {
   gfx::Size layer_size(1000, 1000);
   gfx::Size viewport_size(1000, 1000);
-  scoped_refptr<FakeRasterSource> raster_source =
-      FakeRasterSource::CreateFilledSolidColor(layer_size);
 
   LayerTreeSettings settings;
   settings.layer_transforms_should_scale_layer_contents = true;
   LayerTestCommon::LayerImplTest impl(settings);
   std::unique_ptr<LayerImpl> root =
       LayerImpl::Create(impl.host_impl()->active_tree(), 2);
   std::unique_ptr<LayerImpl> surface =
       LayerImpl::Create(impl.host_impl()->active_tree(), 3);
   surface->SetBounds(layer_size);
   surface->test_properties()->force_render_surface = true;
 
   gfx::Transform scale;
   scale.Scale(2, 2);
   surface->test_properties()->transform = scale;
 
-  surface->test_properties()->SetMaskLayer(FakeMaskLayerImpl::Create(
-      impl.host_impl()->active_tree(), 4, raster_source,
-      Layer::LayerMaskType::SINGLE_TEXTURE_MASK));
+  surface->test_properties()->SetMaskLayer(
+      FakeMaskLayerImpl::Create(impl.host_impl()->active_tree(), 4));
   surface->test_properties()->mask_layer->SetDrawsContent(true);
   surface->test_properties()->mask_layer->SetBounds(layer_size);
 
   std::unique_ptr<LayerImpl> child =
       LayerImpl::Create(impl.host_impl()->active_tree(), 5);
   child->SetDrawsContent(true);
   child->SetBounds(layer_size);
 
   surface->test_properties()->AddChild(std::move(child));
   root->test_properties()->AddChild(std::move(surface));
   impl.host_impl()->active_tree()->SetRootLayerForTesting(std::move(root));
 
   impl.host_impl()->SetViewportSize(viewport_size);
   impl.host_impl()->active_tree()->BuildLayerListAndPropertyTreesForTesting();
   impl.host_impl()->active_tree()->UpdateDrawProperties(false);
 
   LayerImpl* surface_raw = impl.host_impl()
                                ->active_tree()
                                ->root_layer_for_testing()
                                ->test_properties()
                                ->children[0];
   RenderSurfaceImpl* render_surface_impl = surface_raw->GetRenderSurface();
   std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
   AppendQuadsData append_quads_data;
   render_surface_impl->AppendQuads(render_pass.get(), &append_quads_data);
 
-  DCHECK(render_pass->quad_list.front());
   const RenderPassDrawQuad* quad =
       RenderPassDrawQuad::MaterialCast(render_pass->quad_list.front());
-  EXPECT_EQ(gfx::RectF(0, 0, 1, 1), quad->mask_uv_rect);
+  EXPECT_EQ(gfx::RectF(0, 0, 1.f, 1.f), quad->mask_uv_rect);
   EXPECT_EQ(gfx::Vector2dF(2.f, 2.f), quad->filters_scale);
 }
 
 }  // namespace
 }  // namespace cc