Move visual rect unioning between paired items to cc::DisplayItemList.

cc/blink/web_display_item_list_impl.cc

Index: cc/blink/web_display_item_list_impl.cc
diff --git a/cc/blink/web_display_item_list_impl.cc b/cc/blink/web_display_item_list_impl.cc
index c524008ceb95ffda48950421a391c591233c95c5..7a4be016d77e3ad0c71a18eb1233b483efca7469 100644
--- a/cc/blink/web_display_item_list_impl.cc
+++ b/cc/blink/web_display_item_list_impl.cc
@@ -51,7 +51,7 @@ void WebDisplayItemListImpl::appendDrawingItem(
     const blink::WebRect& visual_rect,
     sk_sp<const SkPicture> picture) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::DrawingDisplayItem>(
+    display_item_list_->CreateAndAppendDrawingItem<cc::DrawingDisplayItem>(
         visual_rect, std::move(picture));
   } else {
     cc::DrawingDisplayItem item(std::move(picture));
@@ -60,7 +60,6 @@ void WebDisplayItemListImpl::appendDrawingItem(
 }
 
 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;
@@ -69,97 +68,88 @@ void WebDisplayItemListImpl::appendClipItem(
   }
   bool antialias = true;
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::ClipDisplayItem>(
-        visual_rect, clip_rect, rounded_rects, antialias);
+    display_item_list_->CreateAndAppendPairedBeginItem<cc::ClipDisplayItem>(
+        clip_rect, rounded_rects, antialias);
   } else {
     cc::ClipDisplayItem item(clip_rect, rounded_rects, antialias);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
-void WebDisplayItemListImpl::appendEndClipItem(
-    const blink::WebRect& visual_rect) {
+void WebDisplayItemListImpl::appendEndClipItem() {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndClipDisplayItem>(
-        visual_rect);
+    display_item_list_->CreateAndAppendPairedEndItem<cc::EndClipDisplayItem>();
   } 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()) {
-    display_item_list_->CreateAndAppendItem<cc::ClipPathDisplayItem>(
-        visual_rect, clip_path, clip_op, antialias);
+    display_item_list_->CreateAndAppendPairedBeginItem<cc::ClipPathDisplayItem>(
+        clip_path, clip_op, antialias);
   } else {
     cc::ClipPathDisplayItem item(clip_path, clip_op, antialias);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
-void WebDisplayItemListImpl::appendEndClipPathItem(
-    const blink::WebRect& visual_rect) {
+void WebDisplayItemListImpl::appendEndClipPathItem() {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndClipPathDisplayItem>(
-        visual_rect);
+    display_item_list_
+        ->CreateAndAppendPairedEndItem<cc::EndClipPathDisplayItem>();
   } 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()) {
-    display_item_list_->CreateAndAppendItem<cc::FloatClipDisplayItem>(
-        visual_rect, clip_rect);
+    display_item_list_
+        ->CreateAndAppendPairedBeginItem<cc::FloatClipDisplayItem>(clip_rect);
   } else {
     cc::FloatClipDisplayItem item(clip_rect);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
-void WebDisplayItemListImpl::appendEndFloatClipItem(
-    const blink::WebRect& visual_rect) {
+void WebDisplayItemListImpl::appendEndFloatClipItem() {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndFloatClipDisplayItem>(
-        visual_rect);
+    display_item_list_
+        ->CreateAndAppendPairedEndItem<cc::EndFloatClipDisplayItem>();
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndFloatClipDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendTransformItem(
-    const blink::WebRect& visual_rect,
     const SkMatrix44& matrix) {
   gfx::Transform transform(gfx::Transform::kSkipInitialization);
   transform.matrix() = matrix;
 
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::TransformDisplayItem>(
-        visual_rect, transform);
+    display_item_list_
+        ->CreateAndAppendPairedBeginItem<cc::TransformDisplayItem>(transform);
   } else {
     cc::TransformDisplayItem item(transform);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
-void WebDisplayItemListImpl::appendEndTransformItem(
-    const blink::WebRect& visual_rect) {
+void WebDisplayItemListImpl::appendEndTransformItem() {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndTransformDisplayItem>(
-        visual_rect);
+    display_item_list_
+        ->CreateAndAppendPairedEndItem<cc::EndTransformDisplayItem>();
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndTransformDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendCompositingItem(
-    const blink::WebRect& visual_rect,
     float opacity,
     SkXfermode::Mode xfermode,
     SkRect* bounds,
@@ -171,9 +161,10 @@ void WebDisplayItemListImpl::appendCompositingItem(
 
   const bool kLcdTextRequiresOpaqueLayer = true;
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::CompositingDisplayItem>(
-        visual_rect, static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)),
-        xfermode, bounds, sk_ref_sp(color_filter), kLcdTextRequiresOpaqueLayer);
+    display_item_list_
+        ->CreateAndAppendPairedBeginItem<cc::CompositingDisplayItem>(
+            static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)), xfermode,
+            bounds, sk_ref_sp(color_filter), kLcdTextRequiresOpaqueLayer);
   } else {
     cc::CompositingDisplayItem item(
         static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)), xfermode,
@@ -182,52 +173,47 @@ void WebDisplayItemListImpl::appendCompositingItem(
   }
 }
 
-void WebDisplayItemListImpl::appendEndCompositingItem(
-    const blink::WebRect& visual_rect) {
+void WebDisplayItemListImpl::appendEndCompositingItem() {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndCompositingDisplayItem>(
-        visual_rect);
+    display_item_list_
+        ->CreateAndAppendPairedEndItem<cc::EndCompositingDisplayItem>();
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndCompositingDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendFilterItem(
-    const blink::WebRect& visual_rect,
     const cc::FilterOperations& filters,
     const blink::WebFloatRect& bounds) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::FilterDisplayItem>(
-        visual_rect, filters, bounds);
+    display_item_list_->CreateAndAppendPairedBeginItem<cc::FilterDisplayItem>(
+        filters, bounds);
   } else {
     cc::FilterDisplayItem item(filters, bounds);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
-void WebDisplayItemListImpl::appendEndFilterItem(
-    const blink::WebRect& visual_rect) {
+void WebDisplayItemListImpl::appendEndFilterItem() {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::EndFilterDisplayItem>(
-        visual_rect);
+    display_item_list_
+        ->CreateAndAppendPairedEndItem<cc::EndFilterDisplayItem>();
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndFilterDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendScrollItem(
-    const blink::WebRect& visual_rect,
     const blink::WebSize& scroll_offset,
     ScrollContainerId) {
   SkMatrix44 matrix(SkMatrix44::kUninitialized_Constructor);
   matrix.setTranslate(-scroll_offset.width, -scroll_offset.height, 0);
   // TODO(wkorman): Should we translate the visual rect as well?
-  appendTransformItem(visual_rect, matrix);
+  appendTransformItem(matrix);
 }
 
-void WebDisplayItemListImpl::appendEndScrollItem(
-    const blink::WebRect& visual_rect) {
-  appendEndTransformItem(visual_rect);
+void WebDisplayItemListImpl::appendEndScrollItem() {
+  appendEndTransformItem();
 }
 
 void WebDisplayItemListImpl::setIsSuitableForGpuRasterization(bool isSuitable) {