Replace LayerImpl::sorting_context_id with transform reference.

cc/layers/ui_resource_layer_impl_unittest.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 "cc/layers/append_quads_data.h"
 #include "cc/layers/ui_resource_layer_impl.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/resources/ui_resource_bitmap.h"
@@ skipping 26 matching lines @@
   layer->test_properties()->force_render_surface = true;
 
   UIResourceBitmap bitmap(bitmap_size, opaque);
 
   host_impl->CreateUIResource(uid, bitmap);
   layer->SetUIResourceId(uid);
 
   return layer;
 }
 
-void QuadSizeTest(std::unique_ptr<UIResourceLayerImpl> layer,
+void QuadSizeTest(FakeUIResourceLayerTreeHostImpl* host_impl,
+                  std::unique_ptr<UIResourceLayerImpl> layer,
                   size_t expected_quad_size) {
+  host_impl->active_tree()->SetRootLayerForTesting(std::move(layer));
+  host_impl->active_tree()->BuildPropertyTreesForTesting();
+
   std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
 
   AppendQuadsData data;
-  layer->AppendQuads(render_pass.get(), &data);
+  host_impl->active_tree()->root_layer_for_testing()->AppendQuads(
+      render_pass.get(), &data);
 
   // Verify quad rects
   const QuadList& quads = render_pass->quad_list;
   EXPECT_EQ(expected_quad_size, quads.size());
+
+  host_impl->active_tree()->DetachLayers();
 }
 
 TEST(UIResourceLayerImplTest, VerifyDrawQuads) {
   FakeImplTaskRunnerProvider task_runner_provider;
   TestTaskGraphRunner task_graph_runner;
   std::unique_ptr<CompositorFrameSink> compositor_frame_sink =
       FakeCompositorFrameSink::Create3d();
   FakeUIResourceLayerTreeHostImpl host_impl(&task_runner_provider,
                                             &task_graph_runner);
   host_impl.SetVisible(true);
   host_impl.InitializeRenderer(compositor_frame_sink.get());
 
   // Make sure we're appending quads when there are valid values.
   gfx::Size bitmap_size(100, 100);
   gfx::Size layer_size(100, 100);
   size_t expected_quad_size = 1;
   bool opaque = true;
   UIResourceId uid = 1;
   std::unique_ptr<UIResourceLayerImpl> layer =
       GenerateUIResourceLayer(&host_impl, bitmap_size, layer_size, opaque, uid);
-  QuadSizeTest(std::move(layer), expected_quad_size);
+  QuadSizeTest(&host_impl, std::move(layer), expected_quad_size);
 
   // Make sure we're not appending quads when there are invalid values.
   expected_quad_size = 0;
   uid = 0;
   layer = GenerateUIResourceLayer(&host_impl,
                                   bitmap_size,
                                   layer_size,
                                   opaque,
                                   uid);
-  QuadSizeTest(std::move(layer), expected_quad_size);
+  QuadSizeTest(&host_impl, std::move(layer), expected_quad_size);
 }
 
-void OpaqueBoundsTest(std::unique_ptr<UIResourceLayerImpl> layer,
+void OpaqueBoundsTest(FakeUIResourceLayerTreeHostImpl* host_impl,
+                      std::unique_ptr<UIResourceLayerImpl> layer,
                       const gfx::Rect& expected_opaque_bounds) {
+  host_impl->active_tree()->SetRootLayerForTesting(std::move(layer));
+  host_impl->active_tree()->BuildPropertyTreesForTesting();
+
   std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
 
   AppendQuadsData data;
-  layer->AppendQuads(render_pass.get(), &data);
+  host_impl->active_tree()->root_layer_for_testing()->AppendQuads(
+      render_pass.get(), &data);
 
   // Verify quad rects
   const QuadList& quads = render_pass->quad_list;
   EXPECT_GE(quads.size(), (size_t)0);
   gfx::Rect opaque_rect = quads.front()->opaque_rect;
   EXPECT_EQ(expected_opaque_bounds, opaque_rect);
+
+  host_impl->active_tree()->DetachLayers();
 }
 
 TEST(UIResourceLayerImplTest, VerifySetOpaqueOnSkBitmap) {
   FakeImplTaskRunnerProvider task_runner_provider;
   TestTaskGraphRunner task_graph_runner;
   std::unique_ptr<CompositorFrameSink> compositor_frame_sink =
       FakeCompositorFrameSink::Create3d();
   FakeUIResourceLayerTreeHostImpl host_impl(&task_runner_provider,
                                             &task_graph_runner);
   host_impl.SetVisible(true);
   host_impl.InitializeRenderer(compositor_frame_sink.get());
 
   gfx::Size bitmap_size(100, 100);
   gfx::Size layer_size(100, 100);
   bool opaque = false;
   UIResourceId uid = 1;
   std::unique_ptr<UIResourceLayerImpl> layer =
       GenerateUIResourceLayer(&host_impl, bitmap_size, layer_size, opaque, uid);
   gfx::Rect expected_opaque_bounds;
-  OpaqueBoundsTest(std::move(layer), expected_opaque_bounds);
+  OpaqueBoundsTest(&host_impl, std::move(layer), expected_opaque_bounds);
 
   opaque = true;
   layer = GenerateUIResourceLayer(&host_impl,
                                   bitmap_size,
                                   layer_size,
                                   opaque,
                                   uid);
   expected_opaque_bounds = gfx::Rect(layer->bounds());
-  OpaqueBoundsTest(std::move(layer), expected_opaque_bounds);
+  OpaqueBoundsTest(&host_impl, std::move(layer), expected_opaque_bounds);
 }
 
 TEST(UIResourceLayerImplTest, VerifySetOpaqueOnLayer) {
   FakeImplTaskRunnerProvider task_runner_provider;
   TestTaskGraphRunner task_graph_runner;
   std::unique_ptr<CompositorFrameSink> compositor_frame_sink =
       FakeCompositorFrameSink::Create3d();
   FakeUIResourceLayerTreeHostImpl host_impl(&task_runner_provider,
                                             &task_graph_runner);
   host_impl.SetVisible(true);
   host_impl.InitializeRenderer(compositor_frame_sink.get());
 
   gfx::Size bitmap_size(100, 100);
   gfx::Size layer_size(100, 100);
   bool skbitmap_opaque = false;
   UIResourceId uid = 1;
   std::unique_ptr<UIResourceLayerImpl> layer = GenerateUIResourceLayer(
       &host_impl, bitmap_size, layer_size, skbitmap_opaque, uid);
   layer->SetContentsOpaque(false);
   gfx::Rect expected_opaque_bounds;
-  OpaqueBoundsTest(std::move(layer), expected_opaque_bounds);
+  OpaqueBoundsTest(&host_impl, std::move(layer), expected_opaque_bounds);
 
   layer = GenerateUIResourceLayer(
       &host_impl, bitmap_size, layer_size, skbitmap_opaque, uid);
   layer->SetContentsOpaque(true);
   expected_opaque_bounds = gfx::Rect(layer->bounds());
-  OpaqueBoundsTest(std::move(layer), expected_opaque_bounds);
+  OpaqueBoundsTest(&host_impl, std::move(layer), expected_opaque_bounds);
 }
 
 TEST(UIResourceLayerImplTest, Occlusion) {
   gfx::Size layer_size(1000, 1000);
   gfx::Size viewport_size(1000, 1000);
 
   LayerTestCommon::LayerImplTest impl;
 
   SkBitmap sk_bitmap;
   sk_bitmap.allocN32Pixels(10, 10);
@@ skipping 38 matching lines @@
     LayerTestCommon::VerifyQuadsAreOccluded(
         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);
   }
 }
 
 }  // namespace
 }  // namespace cc