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 4941afe506232d591fe49246f932d242aa41ceaf..5cbac731862db7eb7ded1e0a76e17c21c83e314a 100644 |
--- a/cc/blink/web_display_item_list_impl.cc |
+++ b/cc/blink/web_display_item_list_impl.cc |
@@ -10,6 +10,7 @@ |
#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" |
@@ -18,6 +19,7 @@ |
#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" |
@@ -79,6 +81,11 @@ void WebDisplayItemListImpl::appendTransformItem(const SkMatrix44& 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) { |
@@ -86,14 +93,23 @@ void WebDisplayItemListImpl::appendTransparencyItem( |
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::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) { |