Add a compositing display item which replaces transparency display item

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_blend_mode.h"
 #include "cc/blink/web_filter_operations_impl.h"
 #include "cc/resources/clip_display_item.h"
 #include "cc/resources/clip_path_display_item.h"
+#include "cc/resources/compositing_display_item.h"
 #include "cc/resources/drawing_display_item.h"
 #include "cc/resources/filter_display_item.h"
 #include "cc/resources/float_clip_display_item.h"
 #include "cc/resources/transform_display_item.h"
 #include "cc/resources/transparency_display_item.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
+#include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 #include "ui/gfx/transform.h"
 
 namespace cc_blink {
 
 WebDisplayItemListImpl::WebDisplayItemListImpl()
     : display_item_list_(cc::DisplayItemList::Create()) {
 }
@@ skipping 41 matching lines @@
 void WebDisplayItemListImpl::appendEndFloatClipItem() {
   display_item_list_->AppendItem(cc::EndFloatClipDisplayItem::Create());
 }
 
 void WebDisplayItemListImpl::appendTransformItem(const SkMatrix44& matrix) {
   gfx::Transform transform;
   transform.matrix() = matrix;
   display_item_list_->AppendItem(cc::TransformDisplayItem::Create(transform));
 }
 
+void WebDisplayItemListImpl::appendEndTransformItem() {
+  display_item_list_->AppendItem(cc::EndTransformDisplayItem::Create());
+}
+
+// TODO(pdr): Remove once there are no more callers.
 void WebDisplayItemListImpl::appendTransparencyItem(
     float opacity,
     blink::WebBlendMode blend_mode) {
   display_item_list_->AppendItem(cc::TransparencyDisplayItem::Create(
       opacity, BlendModeToSkia(blend_mode)));
 }
 
-void WebDisplayItemListImpl::appendEndTransformItem() {
-  display_item_list_->AppendItem(cc::EndTransformDisplayItem::Create());
+// TODO(pdr): Remove once there are no more callers.
+void WebDisplayItemListImpl::appendEndTransparencyItem() {
+  display_item_list_->AppendItem(cc::EndTransparencyDisplayItem::Create());
 }
 
-void WebDisplayItemListImpl::appendEndTransparencyItem() {
-  display_item_list_->AppendItem(cc::EndTransparencyDisplayItem::Create());
+void WebDisplayItemListImpl::appendCompositingItem(
+    float opacity,
+    SkXfermode::Mode xfermode,
+    SkColorFilter* color_filter) {
+  display_item_list_->AppendItem(cc::CompositingDisplayItem::Create(
+      opacity, xfermode, skia::SharePtr(color_filter)));
+}
+
+void WebDisplayItemListImpl::appendEndCompositingItem() {
+  display_item_list_->AppendItem(cc::EndCompositingDisplayItem::Create());
 }
 
 void WebDisplayItemListImpl::appendFilterItem(
     const blink::WebFilterOperations& filters,
     const blink::WebFloatRect& bounds) {
   const WebFilterOperationsImpl& filters_impl =
       static_cast<const WebFilterOperationsImpl&>(filters);
   display_item_list_->AppendItem(
       cc::FilterDisplayItem::Create(filters_impl.AsFilterOperations(), bounds));
 }
@@ skipping 11 matching lines @@
 }
 
 void WebDisplayItemListImpl::appendEndScrollItem() {
   appendEndTransformItem();
 }
 
 WebDisplayItemListImpl::~WebDisplayItemListImpl() {
 }
 
 }  // namespace cc_blink