Revert "Raster display item lists via a visual rect RTree."

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp

 // Copyright 2015 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/compositing/PaintArtifactCompositor.h"
 
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/playback/display_item_list.h"
@@ skipping 65 matching lines @@
     m_rootLayer = cc::Layer::Create();
     m_webLayer = wrapUnique(Platform::current()->compositorSupport()->createLayerFromCCLayer(m_rootLayer.get()));
 }
 
 PaintArtifactCompositor::~PaintArtifactCompositor()
 {
 }
 
 namespace {
 
-static gfx::Rect largeRect(-200000, -200000, 400000, 400000);
-
 static void appendDisplayItemToCcDisplayItemList(const DisplayItem& displayItem, cc::DisplayItemList* list)
 {
     if (DisplayItem::isDrawingType(displayItem.getType())) {
         const SkPicture* picture = static_cast<const DrawingDisplayItem&>(displayItem).picture();
         if (!picture)
             return;
-        // In theory we would pass the bounds of the picture, previously done as:
-        // gfx::Rect bounds = gfx::SkIRectToRect(picture->cullRect().roundOut());
-        // or use the visual rect directly. However, clip content layers attempt
-        // to raster in a different space than that of the visual rects. We'll be
-        // reworking visual rects further for SPv2, so for now we just pass a
-        // visual rect large enough to make sure items raster.
-        list->CreateAndAppendItem<cc::DrawingDisplayItem>(largeRect, sk_ref_sp(picture));
+        gfx::Rect bounds = gfx::SkIRectToRect(picture->cullRect().roundOut());
+        list->CreateAndAppendItem<cc::DrawingDisplayItem>(bounds, sk_ref_sp(picture));
     }
 }
 
 static scoped_refptr<cc::DisplayItemList> recordPaintChunk(const PaintArtifact& artifact, const PaintChunk& chunk, const gfx::Rect& combinedBounds)
 {
     cc::DisplayItemListSettings settings;
-    scoped_refptr<cc::DisplayItemList> list = cc::DisplayItemList::Create(settings);
+    scoped_refptr<cc::DisplayItemList> list = cc::DisplayItemList::Create(
+        gfx::Rect(combinedBounds.size()), settings);
 
     gfx::Transform translation;
     translation.Translate(-combinedBounds.x(), -combinedBounds.y());
-    // Passing combinedBounds as the visual rect for the begin/end transform item
-    // would normally be the sensible thing to do, but see comment above re:
-    // visual rects for drawing items and further rework in flight.
-    list->CreateAndAppendItem<cc::TransformDisplayItem>(largeRect, translation);
+    // TODO(jbroman, wkorman): What visual rectangle is wanted here?
+    list->CreateAndAppendItem<cc::TransformDisplayItem>(gfx::Rect(), translation);
 
     const DisplayItemList& displayItems = artifact.getDisplayItemList();
     for (const auto& displayItem : displayItems.itemsInPaintChunk(chunk))
         appendDisplayItemToCcDisplayItemList(displayItem, list.get());
 
-    list->CreateAndAppendItem<cc::EndTransformDisplayItem>(largeRect);
+    list->CreateAndAppendItem<cc::EndTransformDisplayItem>(gfx::Rect());
 
     list->Finalize();
     return list;
 }
 
 static gfx::Transform transformToTransformSpace(const TransformPaintPropertyNode* currentSpace, const TransformPaintPropertyNode* targetSpace)
 {
     TransformationMatrix matrix;
     while (currentSpace != targetSpace) {
         TransformationMatrix localMatrix = currentSpace->matrix();
@@ skipping 471 matching lines @@
         if (m_extraDataForTestingEnabled)
             m_extraDataForTesting->contentLayers.append(layer);
     }
 
     // Mark the property trees as having been rebuilt.
     host->property_trees()->sequence_number = kPropertyTreeSequenceNumber;
     host->property_trees()->needs_rebuild = false;
 }
 
 } // namespace blink