Raster display item lists via a visual rect RTree.

third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 35 matching lines @@
 
 ContentLayerDelegate::ContentLayerDelegate(GraphicsContextPainter* painter)
     : m_painter(painter)
 {
 }
 
 ContentLayerDelegate::~ContentLayerDelegate()
 {
 }
 
-static void paintArtifactToWebDisplayItemList(WebDisplayItemList* list, const PaintArtifact& artifact, const gfx::Rect& bounds)
+static void paintArtifactToWebDisplayItemList(WebDisplayItemList* list, const PaintArtifact& artifact,
+    const PaintController::DisplayItemRectMap& visualRects, const gfx::Rect& bounds)
 {
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         // This is a temporary path to paint the artifact using the paint chunk
         // properties. Ultimately, we should instead split the artifact into
         // separate layers and send those to the compositor, instead of sending
         // one big flat SkPicture.
         SkRect skBounds = SkRect::MakeXYWH(bounds.x(), bounds.y(), bounds.width(), bounds.height());
         RefPtr<SkPicture> picture = paintArtifactToSkPicture(artifact, skBounds);
-        // TODO(wkorman): Pass actual visual rect with the drawing item.
-        list->appendDrawingItem(IntRect(), picture.get());
+        // TODO(wkorman): Why do we need to explicitly construct now? Wasn't required previously.
+        list->appendDrawingItem(WebRect(bounds.x(), bounds.y(), bounds.width(), bounds.height()), picture.get());
         return;
     }
-    artifact.appendToWebDisplayItemList(list);
+    artifact.appendToWebDisplayItemList(visualRects, list);
 }
 
 gfx::Rect ContentLayerDelegate::paintableRegion()
 {
     IntRect interestRect = m_painter->interestRect();
     return gfx::Rect(interestRect.x(), interestRect.y(), interestRect.width(), interestRect.height());
 }
 
 void ContentLayerDelegate::paintContents(
     WebDisplayItemList* webDisplayItemList, WebContentLayerClient::PaintingControlSetting paintingControl)
@@ skipping 12 matching lines @@
 
     GraphicsContext::DisabledMode disabledMode = GraphicsContext::NothingDisabled;
     if (paintingControl == WebContentLayerClient::DisplayListPaintingDisabled
         || paintingControl == WebContentLayerClient::DisplayListConstructionDisabled)
         disabledMode = GraphicsContext::FullyDisabled;
     GraphicsContext context(*paintController, disabledMode);
 
     m_painter->paint(context, nullptr);
 
     paintController->commitNewDisplayItems();
-    paintArtifactToWebDisplayItemList(webDisplayItemList, paintController->paintArtifact(), paintableRegion());
+    paintArtifactToWebDisplayItemList(webDisplayItemList, paintController->paintArtifact(),
+        paintController->displayItemVisualRects(), paintableRegion());
     paintController->setDisplayItemConstructionIsDisabled(false);
 }
 
 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const
 {
     return m_painter->paintController()->approximateUnsharedMemoryUsage();
 }
 
 } // namespace blink