BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 9 insertions, 26 deletions

diff --git a/chromium/third_party/blink/renderer/platform/graphics/paint/foreign_layer_display_item.cc b/chromium/third_party/blink/renderer/platform/graphics/paint/foreign_layer_display_item.cc
index 690644d7dd0..8b76eb1fdd9 100644
--- a/chromium/third_party/blink/renderer/platform/graphics/paint/foreign_layer_display_item.cc
+++ b/chromium/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