Remove the special DisplayItemClient for ForeignLayerDisplayItem

It was to return the visual rect calculated from the cc::Layer's bounds.
It has been doing nothing since we removed DisplayItemClient::VisualRect().

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

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

@@ -60,6 +60,7 @@
 #include "third_party/blink/renderer/platform/graphics/paint/foreign_layer_display_item.h"
 #include "third_party/blink/renderer/platform/graphics/paint/paint_canvas.h"
 #include "third_party/blink/renderer/platform/graphics/paint/paint_recorder.h"
+#include "third_party/blink/renderer/platform/graphics/paint/scoped_display_item_fragment.h"
 #include "third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h"
 #include "third_party/blink/renderer/platform/web_test_support.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
@@ -282,9 +283,10 @@ void LinkHighlightImpl::Paint(GraphicsContext& context) {
                                 ->GetMockGestureTapHighlightsEnabled() &&
                            !object->FirstFragment().NextFragment();
 
-  size_t index = 0;
+  wtf_size_t index = 0;
   for (const auto* fragment = &object->FirstFragment(); fragment;
        fragment = fragment->NextFragment(), ++index) {
+    ScopedDisplayItemFragment scoped_fragment(context, index);
     auto rects = object->OutlineRects(
         fragment->PaintOffset(), NGOutlineType::kIncludeBlockVisualOverflow);
     if (rects.size() > 1)

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

@@ -16,55 +16,22 @@
 
 namespace blink {
 
-namespace {
-
-// It uses DebugName and OwnerNodeId of the input DisplayItemClient, while
-// calculate VisualRect from the layer's offset and bounds.
-class ForeignLayerDisplayItemClient final : public DisplayItemClient {
- public:
-  ForeignLayerDisplayItemClient(const DisplayItemClient& client,
-                                scoped_refptr<cc::Layer> layer)
-      : client_(client), layer_(std::move(layer)) {
-    DCHECK(layer_);
-    Invalidate(PaintInvalidationReason::kUncacheable);
-  }
-
-  String DebugName() const final { return client_.DebugName(); }
-  DOMNodeId OwnerNodeId() const final { return client_.OwnerNodeId(); }
-
-  cc::Layer* GetLayer() const { return layer_.get(); }
-
- private:
-  const DisplayItemClient& client_;
-  scoped_refptr<cc::Layer> layer_;
-};
-
-}  // anonymous namespace
-
 ForeignLayerDisplayItem::ForeignLayerDisplayItem(
     const DisplayItemClient& client,
     Type type,
     scoped_refptr<cc::Layer> layer,
     const IntPoint& offset)
-    : DisplayItem(*new ForeignLayerDisplayItemClient(client, layer),
+    : DisplayItem(client,
                   type,
                   sizeof(*this),
                   IntRect(offset, IntSize(layer->bounds()))),
-      offset_(offset) {
+      offset_(offset),
+      layer_(std::move(layer)) {
   DCHECK(IsForeignLayerType(type));
-  DCHECK(!IsCacheable());
-}
-
-ForeignLayerDisplayItem::~ForeignLayerDisplayItem() {
-  delete &Client();
-}
-
-cc::Layer* ForeignLayerDisplayItem::GetLayer() const {
-  return static_cast<const ForeignLayerDisplayItemClient&>(Client()).GetLayer();
 }
 
 bool ForeignLayerDisplayItem::Equals(const DisplayItem& other) const {
-  return GetType() == other.GetType() &&
+  return DisplayItem::Equals(other) &&
          GetLayer() ==
              static_cast<const ForeignLayerDisplayItem&>(other).GetLayer();
 }

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

@@ -26,9 +26,8 @@ class PLATFORM_EXPORT ForeignLayerDisplayItem : public DisplayItem {
                           Type,
                           scoped_refptr<cc::Layer>,
                           const IntPoint& offset);
-  ~ForeignLayerDisplayItem() override;
 
-  cc::Layer* GetLayer() const;
+  cc::Layer* GetLayer() const { return layer_.get(); }
 
   // DisplayItem
   bool Equals(const DisplayItem&) const final;
@@ -40,6 +39,7 @@ class PLATFORM_EXPORT ForeignLayerDisplayItem : public DisplayItem {
 
  private:
   IntPoint offset_;
+  scoped_refptr<cc::Layer> layer_;
 };
 
 // When a foreign layer's debug name is a literal string, define a instance of

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

@@ -30,7 +30,7 @@ GraphicsLayerDisplayItem::GraphicsLayerDisplayItem(
       graphics_layer_(graphics_layer) {}
 
 bool GraphicsLayerDisplayItem::Equals(const DisplayItem& other) const {
-  return GetType() == other.GetType() &&
+  return DisplayItem::Equals(other) &&
          GetGraphicsLayer() ==
              static_cast<const GraphicsLayerDisplayItem&>(other)
                  .GetGraphicsLayer();