[CI] Remove GraphicsLayer::ContentLayer()

It was the same as GraphicsLayer::CcLayer() and was easily to be mixed
up with Graphics::ContentsLayer() which returns the real contents layer.

Change-Id: I260791979cdd82c42dd23eb20bd5fdb522898b37
Reviewed-on: https://chromium-review.googlesource.com/c/1354440Reviewed-by: Philip Rogers <pdr@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611996}

third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc

@@ -495,10 +495,10 @@ void CompositedLayerMapping::UpdateRasterizationPolicy() {
   bool transformed_rasterization_allowed =
       !(owning_layer_.GetCompositingReasons() &
         CompositingReason::kComboAllDirectReasons);
-  graphics_layer_->ContentLayer()->SetTransformedRasterizationAllowed(
+  graphics_layer_->CcLayer()->SetTransformedRasterizationAllowed(
       transformed_rasterization_allowed);
   if (squashing_layer_)
-    squashing_layer_->ContentLayer()->SetTransformedRasterizationAllowed(true);
+    squashing_layer_->CcLayer()->SetTransformedRasterizationAllowed(true);
 }
 
 void CompositedLayerMapping::UpdateCompositedBounds() {

third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc

@@ -2361,8 +2361,8 @@ TEST_F(CompositedLayerMappingTest,
     GraphicsLayer* target_graphics_layer =
         target_layer ? target_layer->GraphicsLayerBacking() : nullptr;
     ASSERT_TRUE(target_graphics_layer);
-    EXPECT_FALSE(target_graphics_layer->ContentLayer()
-                     ->transformed_rasterization_allowed());
+    EXPECT_FALSE(
+        target_graphics_layer->CcLayer()->transformed_rasterization_allowed());
   }
   {
     LayoutObject* target = GetLayoutObjectByElementId("target2");
@@ -2371,8 +2371,8 @@ TEST_F(CompositedLayerMappingTest,
     GraphicsLayer* target_graphics_layer =
         target_layer ? target_layer->GraphicsLayerBacking() : nullptr;
     ASSERT_TRUE(target_graphics_layer);
-    EXPECT_FALSE(target_graphics_layer->ContentLayer()
-                     ->transformed_rasterization_allowed());
+    EXPECT_FALSE(
+        target_graphics_layer->CcLayer()->transformed_rasterization_allowed());
   }
   {
     LayoutObject* target = GetLayoutObjectByElementId("target3");
@@ -2381,8 +2381,8 @@ TEST_F(CompositedLayerMappingTest,
     GraphicsLayer* target_graphics_layer =
         target_layer ? target_layer->GraphicsLayerBacking() : nullptr;
     ASSERT_TRUE(target_graphics_layer);
-    EXPECT_FALSE(target_graphics_layer->ContentLayer()
-                     ->transformed_rasterization_allowed());
+    EXPECT_FALSE(
+        target_graphics_layer->CcLayer()->transformed_rasterization_allowed());
   }
 }
 
@@ -2404,8 +2404,8 @@ TEST_F(CompositedLayerMappingTest, TransformedRasterizationForInlineTransform) {
   GraphicsLayer* target_graphics_layer =
       target_layer ? target_layer->GraphicsLayerBacking() : nullptr;
   ASSERT_TRUE(target_graphics_layer);
-  EXPECT_TRUE(target_graphics_layer->ContentLayer()
-                  ->transformed_rasterization_allowed());
+  EXPECT_TRUE(
+      target_graphics_layer->CcLayer()->transformed_rasterization_allowed());
 }
 
 // This tests that when the scroller becomes no longer scrollable if a sticky

third_party/blink/renderer/core/paint/paint_and_raster_invalidation_test.cc

@@ -74,7 +74,7 @@ TEST_P(PaintAndRasterInvalidationTest, TrackingForTracing) {
                   ->RootLayer()
                   ->children()[0]
                   .get()
-            : GetLayoutView().Layer()->GraphicsLayerBacking()->ContentLayer();
+            : GetLayoutView().Layer()->GraphicsLayerBacking()->CcLayer();
     return cc_layer->GetLayerClientForTesting()
         ->TakeDebugInfo(cc_layer)
         ->ToString();

third_party/blink/renderer/platform/graphics/graphics_layer.h

@@ -250,8 +250,6 @@ class PLATFORM_EXPORT GraphicsLayer : public cc::LayerClient,
 
   int GetRenderingContext3D() const { return rendering_context3d_; }
 
-  cc::PictureLayer* ContentLayer() const { return layer_.get(); }
-
   static void RegisterContentsLayer(cc::Layer*);
   static void UnregisterContentsLayer(cc::Layer*);