Revert of Don't access DisplayItemClient::VisualRect() for cached display items. (patchset #3 id:40…

third_party/WebKit/Source/platform/graphics/paint/PaintController.h

 // Copyright 2014 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.
 
 #ifndef PaintController_h
 #define PaintController_h
 
 #include <memory>
 #include <utility>
 #include "platform/PlatformExport.h"
@@ skipping 122 matching lines @@
   void RemoveLastDisplayItem();
   const DisplayItem* LastDisplayItem(unsigned offset);
 
   void BeginSkippingCache() { ++skipping_cache_count_; }
   void EndSkippingCache() {
     DCHECK(skipping_cache_count_ > 0);
     --skipping_cache_count_;
   }
   bool IsSkippingCache() const { return skipping_cache_count_; }
 
-  // Must be called when a painting is finished.
-  void CommitNewDisplayItems();
+  // Must be called when a painting is finished. |offsetFromLayoutObject| is the
+  // offset between the space of the GraphicsLayer which owns this
+  // PaintController and the coordinate space of the owning LayoutObject.
+  void CommitNewDisplayItems(
+      const LayoutSize& offset_from_layout_object = LayoutSize());
 
   // Returns the approximate memory usage, excluding memory likely to be
   // shared with the embedder after copying to WebPaintController.
   // Should only be called right after commitNewDisplayItems.
   size_t ApproximateUnsharedMemoryUsage() const;
 
   // Get the artifact generated after the last commit.
   const PaintArtifact& GetPaintArtifact() const;
   const DisplayItemList& GetDisplayItemList() const {
     return GetPaintArtifact().GetDisplayItemList();
@@ skipping 20 matching lines @@
   }
 
   void SetFirstPainted();
   void SetTextPainted();
   void SetImagePainted();
 
   // Returns displayItemList added using createAndAppend() since beginning or
   // the last commitNewDisplayItems(). Use with care.
   DisplayItemList& NewDisplayItemList() { return new_display_item_list_; }
 
-  void AppendDebugDrawingAfterCommit(const DisplayItemClient&,
-                                     sk_sp<PaintRecord>);
+  void AppendDebugDrawingAfterCommit(
+      const DisplayItemClient&,
+      sk_sp<PaintRecord>,
+      const LayoutSize& offset_from_layout_object);
 
   void ShowDebugData() const { ShowDebugDataInternal(false); }
 #ifndef NDEBUG
   void ShowDebugDataWithRecords() const { ShowDebugDataInternal(true); }
 #endif
 
 #if DCHECK_IS_ON()
   void AssertDisplayItemClientsAreLive();
 
   enum Usage { kForNormalUsage, kForPaintRecordBuilder };
@@ skipping 247 matching lines @@
   CachedSubsequenceMap new_cached_subsequences_;
   size_t last_cached_subsequence_end_;
 
   FRIEND_TEST_ALL_PREFIXES(PaintControllerTest, CachedSubsequenceSwapOrder);
   FRIEND_TEST_ALL_PREFIXES(PaintControllerTest, CachedNestedSubsequenceUpdate);
 };
 
 }  // namespace blink
 
 #endif  // PaintController_h