Revert of cc: Shrink size of display item

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 9859d1c39ab4782af2b9d188a8aaad336593f6d3..b030e937b32003ed94906e8f7e426a0901e79956 100644
--- a/cc/blink/web_display_item_list_impl.cc
+++ b/cc/blink/web_display_item_list_impl.cc
@@ -50,11 +50,13 @@
     const blink::WebRect& visual_rect,
     const SkPicture* picture) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::DrawingDisplayItem>(
-        visual_rect, skia::SharePtr(const_cast<SkPicture*>(picture)));
-  } else {
-    cc::DrawingDisplayItem item(
-        skia::SharePtr(const_cast<SkPicture*>(picture)));
+    auto* item =
+        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);
   }
 }
@@ -68,10 +70,12 @@
     rounded_rects.push_back(rounded_clip_rects[i]);
   }
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::ClipDisplayItem>(
-        visual_rect, clip_rect, rounded_rects);
-  } else {
-    cc::ClipDisplayItem item(clip_rect, rounded_rects);
+    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);
   }
 }
@@ -92,10 +96,13 @@
     SkRegion::Op clip_op,
     bool antialias) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::ClipPathDisplayItem>(
-        visual_rect, clip_path, clip_op, antialias);
-  } else {
-    cc::ClipPathDisplayItem item(clip_path, clip_op, antialias);
+    auto* item =
+        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);
   }
 }
@@ -114,10 +121,13 @@
     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);
-  } else {
-    cc::FloatClipDisplayItem item(clip_rect);
+    auto* item =
+        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);
   }
 }
@@ -139,10 +149,13 @@
   transform.matrix() = matrix;
 
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::TransformDisplayItem>(
-        visual_rect, transform);
-  } else {
-    cc::TransformDisplayItem item(transform);
+    auto* item =
+        display_item_list_->CreateAndAppendItem<cc::TransformDisplayItem>(
+            visual_rect);
+    item->SetNew(transform);
+  } else {
+    cc::TransformDisplayItem item;
+    item.SetNew(transform);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
@@ -169,13 +182,15 @@
   // value, but that breaks slimming paint reftests.
 
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::CompositingDisplayItem>(
-        visual_rect, static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)),
-        xfermode, bounds, skia::SharePtr(color_filter));
-  } else {
-    cc::CompositingDisplayItem item(
-        static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)), xfermode,
-        bounds, skia::SharePtr(color_filter));
+    auto* item =
+        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);
   }
 }
@@ -198,10 +213,12 @@
       static_cast<const WebFilterOperationsImpl&>(filters);
 
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendItem<cc::FilterDisplayItem>(
-        visual_rect, filters_impl.AsFilterOperations(), bounds);
-  } else {
-    cc::FilterDisplayItem item(filters_impl.AsFilterOperations(), bounds);
+    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);
   }
 }