Further plumb visual rect into cc:DisplayItemList.

cc/blink/web_display_item_list_impl.cc

 // 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.
 
 #include "cc/blink/web_display_item_list_impl.h"
 
 #include <vector>
 
 #include "cc/blink/web_filter_operations_impl.h"
 #include "cc/playback/clip_display_item.h"
@@ skipping 33 matching lines @@
 WebDisplayItemListImpl::WebDisplayItemListImpl(
     cc::DisplayItemList* display_list)
     : display_item_list_(display_list) {
 }
 
 void WebDisplayItemListImpl::appendDrawingItem(
     const blink::WebRect& visual_rect,
     const SkPicture* picture) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
     auto* item =
-        display_item_list_->CreateAndAppendItem<cc::DrawingDisplayItem>();
+        display_item_list_->CreateAndAppendItem<cc::DrawingDisplayItem>(
+            visual_rect);
     item->SetNew(skia::SharePtr(const_cast<SkPicture*>(picture)));
   } else {
     cc::DrawingDisplayItem item;
     item.SetNew(skia::SharePtr(const_cast<SkPicture*>(picture)));
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
 void WebDisplayItemListImpl::appendClipItem(
     const blink::WebRect& visual_rect,
     const blink::WebRect& clip_rect,
     const blink::WebVector<SkRRect>& rounded_clip_rects) {
   std::vector<SkRRect> rounded_rects;
   for (size_t i = 0; i < rounded_clip_rects.size(); ++i) {
     rounded_rects.push_back(rounded_clip_rects[i]);
   }
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    auto* item = display_item_list_->CreateAndAppendItem<cc::ClipDisplayItem>();
+    auto* item = display_item_list_->CreateAndAppendItem<cc::ClipDisplayItem>(
+        visual_rect);
     item->SetNew(clip_rect, rounded_rects);
   } else {
     cc::ClipDisplayItem item;
     item.SetNew(clip_rect, rounded_rects);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
 void WebDisplayItemListImpl::appendEndClipItem(
     const blink::WebRect& visual_rect) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndClipDisplayItem>();
+    display_item_list_->CreateAndAppendItem<cc::EndClipDisplayItem>(
+        visual_rect);
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndClipDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendClipPathItem(
     const blink::WebRect& visual_rect,
     const SkPath& clip_path,
     SkRegion::Op clip_op,
     bool antialias) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
     auto* item =
-        display_item_list_->CreateAndAppendItem<cc::ClipPathDisplayItem>();
+        display_item_list_->CreateAndAppendItem<cc::ClipPathDisplayItem>(
+            visual_rect);
     item->SetNew(clip_path, clip_op, antialias);
   } else {
     cc::ClipPathDisplayItem item;
     item.SetNew(clip_path, clip_op, antialias);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
 void WebDisplayItemListImpl::appendEndClipPathItem(
     const blink::WebRect& visual_rect) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndClipPathDisplayItem>();
+    display_item_list_->CreateAndAppendItem<cc::EndClipPathDisplayItem>(
+        visual_rect);
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndClipPathDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendFloatClipItem(
     const blink::WebRect& visual_rect,
     const blink::WebFloatRect& clip_rect) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
     auto* item =
-        display_item_list_->CreateAndAppendItem<cc::FloatClipDisplayItem>();
+        display_item_list_->CreateAndAppendItem<cc::FloatClipDisplayItem>(
+            visual_rect);
     item->SetNew(clip_rect);
   } else {
     cc::FloatClipDisplayItem item;
     item.SetNew(clip_rect);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
 void WebDisplayItemListImpl::appendEndFloatClipItem(
     const blink::WebRect& visual_rect) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndFloatClipDisplayItem>();
+    display_item_list_->CreateAndAppendItem<cc::EndFloatClipDisplayItem>(
+        visual_rect);
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndFloatClipDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendTransformItem(
     const blink::WebRect& visual_rect,
     const SkMatrix44& matrix) {
   gfx::Transform transform;
   transform.matrix() = matrix;
 
   if (display_item_list_->RetainsIndividualDisplayItems()) {
     auto* item =
-        display_item_list_->CreateAndAppendItem<cc::TransformDisplayItem>();
+        display_item_list_->CreateAndAppendItem<cc::TransformDisplayItem>(
+            visual_rect);
     item->SetNew(transform);
   } else {
     cc::TransformDisplayItem item;
     item.SetNew(transform);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
 void WebDisplayItemListImpl::appendEndTransformItem(
     const blink::WebRect& visual_rect) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndTransformDisplayItem>();
+    display_item_list_->CreateAndAppendItem<cc::EndTransformDisplayItem>(
+        visual_rect);
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndTransformDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendCompositingItem(
     const blink::WebRect& visual_rect,
     float opacity,
     SkXfermode::Mode xfermode,
     SkRect* bounds,
     SkColorFilter* color_filter) {
   DCHECK_GE(opacity, 0.f);
   DCHECK_LE(opacity, 1.f);
   // TODO(ajuma): This should really be rounding instead of flooring the alpha
   // value, but that breaks slimming paint reftests.
 
   if (display_item_list_->RetainsIndividualDisplayItems()) {
     auto* item =
-        display_item_list_->CreateAndAppendItem<cc::CompositingDisplayItem>();
+        display_item_list_->CreateAndAppendItem<cc::CompositingDisplayItem>(
+            visual_rect);
     item->SetNew(static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)),
                  xfermode, bounds, skia::SharePtr(color_filter));
   } else {
     cc::CompositingDisplayItem item;
     item.SetNew(static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)),
                 xfermode, bounds, skia::SharePtr(color_filter));
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
 void WebDisplayItemListImpl::appendEndCompositingItem(
     const blink::WebRect& visual_rect) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndCompositingDisplayItem>();
+    display_item_list_->CreateAndAppendItem<cc::EndCompositingDisplayItem>(
+        visual_rect);
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndCompositingDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendFilterItem(
     const blink::WebRect& visual_rect,
     const blink::WebFilterOperations& filters,
     const blink::WebFloatRect& bounds) {
   const WebFilterOperationsImpl& filters_impl =
       static_cast<const WebFilterOperationsImpl&>(filters);
 
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    auto* item =
-        display_item_list_->CreateAndAppendItem<cc::FilterDisplayItem>();
+    auto* item = display_item_list_->CreateAndAppendItem<cc::FilterDisplayItem>(
+        visual_rect);
     item->SetNew(filters_impl.AsFilterOperations(), bounds);
   } else {
     cc::FilterDisplayItem item;
     item.SetNew(filters_impl.AsFilterOperations(), bounds);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
 void WebDisplayItemListImpl::appendEndFilterItem(
     const blink::WebRect& visual_rect) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndFilterDisplayItem>();
+    display_item_list_->CreateAndAppendItem<cc::EndFilterDisplayItem>(
+        visual_rect);
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndFilterDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendScrollItem(
     const blink::WebRect& visual_rect,
     const blink::WebSize& scroll_offset,
     ScrollContainerId) {
   SkMatrix44 matrix;
   matrix.setTranslate(-scroll_offset.width, -scroll_offset.height, 0);
   // TODO(wkorman): Should we translate the visual rect as well?
   appendTransformItem(visual_rect, matrix);
 }
 
 void WebDisplayItemListImpl::appendEndScrollItem(
     const blink::WebRect& visual_rect) {
   appendEndTransformItem(visual_rect);
 }
 
 WebDisplayItemListImpl::~WebDisplayItemListImpl() {
 }
 
 }  // namespace cc_blink