Revert of Don't access DisplayItemClient::VisualRect() for cached display items.

third_party/WebKit/Source/platform/graphics/paint/DisplayItemList.cpp

 // Copyright 2016 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 "platform/graphics/paint/DisplayItemList.h"
 
 #include "platform/graphics/LoggingCanvas.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/PaintChunk.h"
 
 #ifndef NDEBUG
 #include "platform/wtf/text/WTFString.h"
 #endif
 
 namespace blink {
 
+DisplayItem& DisplayItemList::AppendByMoving(DisplayItem& item) {
+#ifndef NDEBUG
+  String original_debug_string = item.AsDebugString();
+#endif
+  DCHECK(item.HasValidClient());
+  DisplayItem& result =
+      ContiguousContainer::AppendByMoving(item, item.DerivedSize());
+  // ContiguousContainer::appendByMoving() calls an in-place constructor
+  // on item which replaces it with a tombstone/"dead display item" that
+  // can be safely destructed but should never be used.
+  DCHECK(!item.HasValidClient());
+#ifndef NDEBUG
+  // Save original debug string in the old item to help debugging.
+  item.SetClientDebugString(original_debug_string);
+#endif
+  return result;
+}
+
+void DisplayItemList::AppendVisualRect(const IntRect& visual_rect) {
+  visual_rects_.push_back(visual_rect);
+}
+
 DisplayItemList::Range<DisplayItemList::iterator>
 DisplayItemList::ItemsInPaintChunk(const PaintChunk& paint_chunk) {
   return Range<iterator>(begin() + paint_chunk.begin_index,
                          begin() + paint_chunk.end_index);
 }
 
 DisplayItemList::Range<DisplayItemList::const_iterator>
 DisplayItemList::ItemsInPaintChunk(const PaintChunk& paint_chunk) const {
   return Range<const_iterator>(begin() + paint_chunk.begin_index,
                                begin() + paint_chunk.end_index);
@@ skipping 42 matching lines @@
 #ifndef NDEBUG
       if ((options & kShowPaintRecords) && display_item.IsDrawing()) {
         const DrawingDisplayItem& item =
             static_cast<const DrawingDisplayItem&>(display_item);
         if (const PaintRecord* record = item.GetPaintRecord().get()) {
           json->SetString("record", RecordAsDebugString(record));
         }
       }
 #endif
     }
-
-    json->SetString("visualRect", display_item.VisualRect().ToString());
-
+    if (HasVisualRect(i)) {
+      IntRect local_visual_rect = VisualRect(i);
+      json->SetString(
+          "visualRect",
+          String::Format("[%d,%d %dx%d]", local_visual_rect.X(),
+                         local_visual_rect.Y(), local_visual_rect.Width(),
+                         local_visual_rect.Height()));
+    }
     json_array->PushObject(std::move(json));
   }
   return json_array;
 }
 
 }  // namespace blink