Update from https://crrev.com/316786

cc/resources/filter_display_item.h

Index: cc/resources/filter_display_item.h
diff --git a/cc/resources/filter_display_item.h b/cc/resources/filter_display_item.h
index 958647b8df6d0e1fc0e83504f81987095190b6f8..28eeb95dc806f81ef9e8b9af1a79b644bd928602 100644
--- a/cc/resources/filter_display_item.h
+++ b/cc/resources/filter_display_item.h
@@ -7,13 +7,12 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
+#include "cc/output/filter_operations.h"
 #include "cc/resources/display_item.h"
-#include "skia/ext/refptr.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 class SkCanvas;
 class SkDrawPictureCallback;
-class SkImageFilter;
 
 namespace cc {
 
@@ -21,10 +20,9 @@ class CC_EXPORT FilterDisplayItem : public DisplayItem {
  public:
   ~FilterDisplayItem() override;
 
-  static scoped_ptr<FilterDisplayItem> Create(
-      skia::RefPtr<SkImageFilter> filter,
-      gfx::RectF bounds) {
-    return make_scoped_ptr(new FilterDisplayItem(filter, bounds));
+  static scoped_ptr<FilterDisplayItem> Create(const FilterOperations& filters,
+                                              gfx::RectF bounds) {
+    return make_scoped_ptr(new FilterDisplayItem(filters, bounds));
   }
 
   void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override;
@@ -32,13 +30,13 @@ class CC_EXPORT FilterDisplayItem : public DisplayItem {
   bool IsSuitableForGpuRasterization() const override;
   int ApproximateOpCount() const override;
   size_t PictureMemoryUsage() const override;
-  void AsValueInto(base::debug::TracedValue* array) const override;
+  void AsValueInto(base::trace_event::TracedValue* array) const override;
 
  protected:
-  FilterDisplayItem(skia::RefPtr<SkImageFilter> filter, gfx::RectF bounds);
+  FilterDisplayItem(const FilterOperations& filters, gfx::RectF bounds);
 
  private:
-  skia::RefPtr<SkImageFilter> filter_;
+  FilterOperations filters_;
   gfx::RectF bounds_;
 };
 
@@ -55,7 +53,7 @@ class CC_EXPORT EndFilterDisplayItem : public DisplayItem {
   bool IsSuitableForGpuRasterization() const override;
   int ApproximateOpCount() const override;
   size_t PictureMemoryUsage() const override;
-  void AsValueInto(base::debug::TracedValue* array) const override;
+  void AsValueInto(base::trace_event::TracedValue* array) const override;
 
  protected:
   EndFilterDisplayItem();