Find cached display items directly during painting

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/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/PaintChunk.h"
 #include "third_party/skia/include/core/SkPictureAnalyzer.h"
 
 #ifndef NDEBUG
 #include "wtf/text/WTFString.h"
 #endif
 
 namespace blink {
 
-DisplayItem& DisplayItemList::appendByMoving(DisplayItem& item, const IntRect& visualRect, SkPictureGpuAnalyzer& gpuAnalyzer)
+DisplayItem& DisplayItemList::appendByMoving(DisplayItem& item)
 {
-    // No reason to continue the analysis once we have a veto.

[jbroman, 2016/07/06 19:09:37]

Why is this no longer needed?

[Xianzhu, 2016/07/06 19:29:34]

Now this is done in PaintController::commitNewDisplayItems().

-    if (gpuAnalyzer.suitableForGpuRasterization())
-        item.analyzeForGpuRasterization(gpuAnalyzer);
-
 #ifndef NDEBUG
     String originalDebugString = item.asDebugString();
 #endif
     ASSERT(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.
     ASSERT(!item.hasValidClient());
 #ifndef NDEBUG
     // Save original debug string in the old item to help debugging.
     item.setClientDebugString(originalDebugString);
 #endif
-    appendVisualRect(visualRect);
     return result;
 }
 
 void DisplayItemList::appendVisualRect(const IntRect& visualRect)
 {
     size_t itemIndex = m_visualRects.size();
     const DisplayItem& item = (*this)[itemIndex];
 
     // For paired display items such as transforms, since we are not guaranteed containment, the
     // visual rect must comprise the union of the visual rects for all items within its block.
@@ skipping 30 matching lines @@
     return Range<iterator>(begin() + paintChunk.beginIndex, begin() + paintChunk.endIndex);
 }
 
 DisplayItemList::Range<DisplayItemList::const_iterator>
 DisplayItemList::itemsInPaintChunk(const PaintChunk& paintChunk) const
 {
     return Range<const_iterator>(begin() + paintChunk.beginIndex, begin() + paintChunk.endIndex);
 }
 
 } // namespace blink