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

cc/playback/display_item_proto_factory.cc

 // 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 "cc/playback/display_item_proto_factory.h"
 
 #include "cc/playback/clip_display_item.h"
 #include "cc/playback/clip_path_display_item.h"
 #include "cc/playback/compositing_display_item.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/playback/filter_display_item.h"
 #include "cc/playback/float_clip_display_item.h"
 #include "cc/playback/transform_display_item.h"
 #include "cc/proto/display_item.pb.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 class ClientPictureCache;
 
 // static
 void DisplayItemProtoFactory::AllocateAndConstruct(
     const gfx::Rect& visual_rect,
     DisplayItemList* list,
     const proto::DisplayItem& proto,
     ClientPictureCache* client_picture_cache,
     std::vector<uint32_t>* used_engine_picture_ids) {
   switch (proto.type()) {
     case proto::DisplayItem::Type_Clip:
-      list->CreateAndAppendItem<ClipDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_EndClip:
-      list->CreateAndAppendItem<EndClipDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedEndItem<EndClipDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_ClipPath:
-      list->CreateAndAppendItem<ClipPathDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedBeginItem<ClipPathDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_EndClipPath:
-      list->CreateAndAppendItem<EndClipPathDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedEndItem<EndClipPathDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_Compositing:
-      list->CreateAndAppendItem<CompositingDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedBeginItem<CompositingDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_EndCompositing:
-      list->CreateAndAppendItem<EndCompositingDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedEndItem<EndCompositingDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_Drawing:
-      list->CreateAndAppendItem<DrawingDisplayItem>(
+      list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
           visual_rect, proto, client_picture_cache, used_engine_picture_ids);
       return;
     case proto::DisplayItem::Type_Filter:
-      list->CreateAndAppendItem<FilterDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedBeginItem<FilterDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_EndFilter:
-      list->CreateAndAppendItem<EndFilterDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedEndItem<EndFilterDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_FloatClip:
-      list->CreateAndAppendItem<FloatClipDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedBeginItem<FloatClipDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_EndFloatClip:
-      list->CreateAndAppendItem<EndFloatClipDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedEndItem<EndFloatClipDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_Transform:
-      list->CreateAndAppendItem<TransformDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(proto);
       return;
     case proto::DisplayItem::Type_EndTransform:
-      list->CreateAndAppendItem<EndTransformDisplayItem>(visual_rect, proto);
+      list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>(proto);
       return;
   }
 
   NOTREACHED();
 }
 
 }  // namespace cc