Remove ForeignLayerDisplayItem::GetLayerAsJSONClient()

It has not been used since we separated GraphicsLayerDisplayItem
from ForeignLayerDisplayItem.

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

third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc

@@ -125,7 +125,6 @@ std::unique_ptr<JSONObject> PaintArtifactCompositor::GetLayersAsJSON(
         const auto& foreign_layer_display_item =
             static_cast<const ForeignLayerDisplayItem&>(display_item);
         layer = foreign_layer_display_item.GetLayer();
-        json_client = foreign_layer_display_item.GetLayerAsJSONClient();
       }
       // Need to retrieve the transform from |pending_layers_| so that
       // any decomposition is not double-reported via |layer|'s

third_party/blink/renderer/platform/graphics/paint/foreign_layer_display_item.cc

@@ -54,14 +54,12 @@ ForeignLayerDisplayItem::ForeignLayerDisplayItem(
     const DisplayItemClient& client,
     Type type,
     scoped_refptr<cc::Layer> layer,
-    const FloatPoint& offset,
-    const LayerAsJSONClient* json_client)
+    const FloatPoint& offset)
     : DisplayItem(
           *new ForeignLayerDisplayItemClient(client, std::move(layer), offset),
           type,
           sizeof(*this)),
-      offset_(offset),
-      json_client_(json_client) {
+      offset_(offset) {
   DCHECK(IsForeignLayerType(type));
   DCHECK(!IsCacheable());
 }
@@ -74,10 +72,6 @@ cc::Layer* ForeignLayerDisplayItem::GetLayer() const {
   return static_cast<const ForeignLayerDisplayItemClient&>(Client()).GetLayer();
 }
 
-const LayerAsJSONClient* ForeignLayerDisplayItem::GetLayerAsJSONClient() const {
-  return json_client_;
-}
-
 bool ForeignLayerDisplayItem::Equals(const DisplayItem& other) const {
   return GetType() == other.GetType() &&
          GetLayer() ==
@@ -93,13 +87,12 @@ void ForeignLayerDisplayItem::PropertiesAsJSON(JSONObject& json) const {
 }
 #endif
 
-static void RecordForeignLayerInternal(GraphicsContext& context,
-                                       const DisplayItemClient& client,
-                                       DisplayItem::Type type,
-                                       scoped_refptr<cc::Layer> layer,
-                                       const FloatPoint& offset,
-                                       const LayerAsJSONClient* json_client,
-                                       const PropertyTreeState* properties) {
+void RecordForeignLayer(GraphicsContext& context,
+                        const DisplayItemClient& client,
+                        DisplayItem::Type type,
+                        scoped_refptr<cc::Layer> layer,
+                        const FloatPoint& offset,
+                        const PropertyTreeState* properties) {
   PaintController& paint_controller = context.GetPaintController();
   // This is like ScopedPaintChunkProperties but uses null id because foreign
   // layer chunk doesn't need an id nor a client.
@@ -109,21 +102,11 @@ static void RecordForeignLayerInternal(GraphicsContext& context,
     paint_controller.UpdateCurrentPaintChunkProperties(nullptr, *properties);
   }
   paint_controller.CreateAndAppend<ForeignLayerDisplayItem>(
-      client, type, std::move(layer), offset, json_client);
+      client, type, std::move(layer), offset);
   if (properties) {
     paint_controller.UpdateCurrentPaintChunkProperties(nullptr,
                                                        *previous_properties);
   }
 }
 
-void RecordForeignLayer(GraphicsContext& context,
-                        const DisplayItemClient& client,
-                        DisplayItem::Type type,
-                        scoped_refptr<cc::Layer> layer,
-                        const FloatPoint& offset,
-                        const PropertyTreeState* properties) {
-  RecordForeignLayerInternal(context, client, type, std::move(layer), offset,
-                             nullptr, properties);
-}
-
 }  // namespace blink

third_party/blink/renderer/platform/graphics/paint/foreign_layer_display_item.h

@@ -13,7 +13,6 @@
 namespace blink {
 
 class GraphicsContext;
-class LayerAsJSONClient;
 
 // Represents foreign content (produced outside Blink) which draws to a layer.
 // A client supplies a layer which can be unwrapped and inserted into the full
@@ -26,14 +25,11 @@ class PLATFORM_EXPORT ForeignLayerDisplayItem : public DisplayItem {
   ForeignLayerDisplayItem(const DisplayItemClient& client,
                           Type,
                           scoped_refptr<cc::Layer>,
-                          const FloatPoint& offset,
-                          const LayerAsJSONClient*);
+                          const FloatPoint& offset);
   ~ForeignLayerDisplayItem() override;
 
   cc::Layer* GetLayer() const;
 
-  const LayerAsJSONClient* GetLayerAsJSONClient() const;
-
   // DisplayItem
   bool Equals(const DisplayItem&) const final;
 #if DCHECK_IS_ON()
@@ -44,7 +40,6 @@ class PLATFORM_EXPORT ForeignLayerDisplayItem : public DisplayItem {
 
  private:
   FloatPoint offset_;
-  const LayerAsJSONClient* json_client_;
 };
 
 // When a foreign layer's debug name is a literal string, define a instance of

third_party/blink/renderer/platform/graphics/paint/paint_chunker_test.cc

@@ -56,8 +56,7 @@ class TestDisplayItemRequiringSeparateChunk : public ForeignLayerDisplayItem {
       : ForeignLayerDisplayItem(client,
                                 DisplayItem::kForeignLayerPlugin,
                                 cc::Layer::Create(),
-                                FloatPoint(),
-                                nullptr) {}
+                                FloatPoint()) {}
 };
 
 TEST_F(PaintChunkerTest, Empty) {

third_party/blink/renderer/platform/testing/test_paint_artifact.cc

@@ -82,8 +82,7 @@ TestPaintArtifact& TestPaintArtifact::ForeignLayer(
     const FloatPoint& offset) {
   DEFINE_STATIC_LOCAL(LiteralDebugNameClient, client, ("ForeignLayer"));
   display_item_list_.AllocateAndConstruct<ForeignLayerDisplayItem>(
-      client, DisplayItem::kForeignLayerFirst, std::move(layer), offset,
-      nullptr);
+      client, DisplayItem::kForeignLayerFirst, std::move(layer), offset);
   DidAddDisplayItem();
   return *this;
 }