Update from https://crrev.com/316786

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/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/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()) {
 }
 
 scoped_refptr<cc::DisplayItemList> WebDisplayItemListImpl::ToDisplayItemList() {
   return display_item_list_;
 }
 
+void WebDisplayItemListImpl::appendDrawingItem(const SkPicture* picture) {
+  display_item_list_->AppendItem(cc::DrawingDisplayItem::Create(
+      skia::SharePtr(const_cast<SkPicture*>(picture)), gfx::PointF(0, 0)));
+}
+
 void WebDisplayItemListImpl::appendDrawingItem(
     SkPicture* picture,
     const blink::WebFloatPoint& location) {
   display_item_list_->AppendItem(
       cc::DrawingDisplayItem::Create(skia::SharePtr(picture), location));
 }
 
 void WebDisplayItemListImpl::appendClipItem(
     const blink::WebRect& clip_rect,
     const blink::WebVector<SkRRect>& rounded_clip_rects) {
@@ skipping 43 matching lines @@
 }
 
 void WebDisplayItemListImpl::appendEndTransformItem() {
   display_item_list_->AppendItem(cc::EndTransformDisplayItem::Create());
 }
 
 void WebDisplayItemListImpl::appendEndTransparencyItem() {
   display_item_list_->AppendItem(cc::EndTransparencyDisplayItem::Create());
 }
 
+#if FILTER_DISPLAY_ITEM_USES_FILTER_OPERATIONS
+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));
+}
+#else
 void WebDisplayItemListImpl::appendFilterItem(
     SkImageFilter* filter,
     const blink::WebFloatRect& bounds) {
+  cc::FilterOperations filter_operations;
+  filter_operations.Append(
+      cc::FilterOperation::CreateReferenceFilter(skia::SharePtr(filter)));
   display_item_list_->AppendItem(
-      cc::FilterDisplayItem::Create(skia::SharePtr(filter), bounds));
+      cc::FilterDisplayItem::Create(filter_operations, bounds));
 }
+#endif
 
 void WebDisplayItemListImpl::appendEndFilterItem() {
   display_item_list_->AppendItem(cc::EndFilterDisplayItem::Create());
 }
 
 WebDisplayItemListImpl::~WebDisplayItemListImpl() {
 }
 
 }  // namespace cc_blink