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

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 72 matching lines @@
 
 namespace {
 
 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;
         gfx::Rect bounds = gfx::SkIRectToRect(picture->cullRect().roundOut());
-        list->CreateAndAppendItem<cc::DrawingDisplayItem>(bounds, sk_ref_sp(picture));
+        list->CreateAndAppendDrawingItem<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(
         gfx::Rect(combinedBounds.size()), settings);
 
     gfx::Transform translation;
     translation.Translate(-combinedBounds.x(), -combinedBounds.y());
     // TODO(jbroman, wkorman): What visual rectangle is wanted here?
-    list->CreateAndAppendItem<cc::TransformDisplayItem>(gfx::Rect(), translation);
+    list->CreateAndAppendPairedBeginItem<cc::TransformDisplayItem>(translation);
 
     const DisplayItemList& displayItems = artifact.getDisplayItemList();
     for (const auto& displayItem : displayItems.itemsInPaintChunk(chunk))
         appendDisplayItemToCcDisplayItemList(displayItem, list.get());
 
-    list->CreateAndAppendItem<cc::EndTransformDisplayItem>(gfx::Rect());
+    list->CreateAndAppendPairedEndItem<cc::EndTransformDisplayItem>();
 
     list->Finalize();
     return list;
 }
 
 static gfx::Transform transformToTransformSpace(const TransformPaintPropertyNode* currentSpace, const TransformPaintPropertyNode* targetSpace)
 {
     TransformationMatrix matrix;
     while (currentSpace != targetSpace) {
         TransformationMatrix localMatrix = currentSpace->matrix();
@@ skipping 473 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