Update from https://crrev.com/318214

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 4941afe506232d591fe49246f932d242aa41ceaf..6a4ab90d10ff6cdf24a8ae5e5ab0cfba94b78fee 100644
--- a/cc/blink/web_display_item_list_impl.cc
+++ b/cc/blink/web_display_item_list_impl.cc
@@ -10,14 +10,15 @@
 #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"
@@ -79,19 +80,29 @@ void WebDisplayItemListImpl::appendTransformItem(const SkMatrix44& matrix) {
   display_item_list_->AppendItem(cc::TransformDisplayItem::Create(transform));
 }
 
-void WebDisplayItemListImpl::appendTransparencyItem(
+void WebDisplayItemListImpl::appendEndTransformItem() {
+  display_item_list_->AppendItem(cc::EndTransformDisplayItem::Create());
+}
+
+// TODO(pdr): Remove this once the blink-side callers have been removed.
+void WebDisplayItemListImpl::appendCompositingItem(
     float opacity,
-    blink::WebBlendMode blend_mode) {
-  display_item_list_->AppendItem(cc::TransparencyDisplayItem::Create(
-      opacity, BlendModeToSkia(blend_mode)));
+    SkXfermode::Mode xfermode,
+    SkColorFilter* color_filter) {
+  appendCompositingItem(opacity, xfermode, nullptr, color_filter);
 }
 
-void WebDisplayItemListImpl::appendEndTransformItem() {
-  display_item_list_->AppendItem(cc::EndTransformDisplayItem::Create());
+void WebDisplayItemListImpl::appendCompositingItem(
+    float opacity,
+    SkXfermode::Mode xfermode,
+    SkRect* bounds,
+    SkColorFilter* color_filter) {
+  display_item_list_->AppendItem(cc::CompositingDisplayItem::Create(
+      opacity, xfermode, bounds, skia::SharePtr(color_filter)));
 }
 
-void WebDisplayItemListImpl::appendEndTransparencyItem() {
-  display_item_list_->AppendItem(cc::EndTransparencyDisplayItem::Create());
+void WebDisplayItemListImpl::appendEndCompositingItem() {
+  display_item_list_->AppendItem(cc::EndCompositingDisplayItem::Create());
 }
 
 void WebDisplayItemListImpl::appendFilterItem(