cc: Move DisplayItem::Raster up to DisplayItemList

cc/playback/filter_display_item.h

Index: cc/playback/filter_display_item.h
diff --git a/cc/playback/filter_display_item.h b/cc/playback/filter_display_item.h
index 054fed5e53d27b7b7e32170f8822d828aeb381e5..e574b6598daabe9384775fb1e594bb3e5c936a6d 100644
--- a/cc/playback/filter_display_item.h
+++ b/cc/playback/filter_display_item.h
@@ -5,18 +5,12 @@
 #ifndef CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_
 
-#include <stddef.h>
-
-#include <memory>
-
-#include "base/memory/ptr_util.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/filter_operations.h"
 #include "cc/playback/display_item.h"
+#include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect_f.h"
 
-class SkCanvas;
-
 namespace cc {
 
 class CC_EXPORT FilterDisplayItem : public DisplayItem {
@@ -26,26 +20,16 @@ class CC_EXPORT FilterDisplayItem : public DisplayItem {
                     const gfx::PointF& origin);
   ~FilterDisplayItem() override;
 
-  void Raster(SkCanvas* canvas,
-              SkPicture::AbortCallback* callback) const override;
-
   size_t ExternalMemoryUsage() const {
     // FilterOperations doesn't expose its capacity, but size is probably good
     // enough.
-    return filters_.size() * sizeof(filters_.at(0));
+    return filters.size() * sizeof(filters.at(0));
   }
   int ApproximateOpCount() const { return 1; }
 
-  const gfx::RectF& bounds() const { return bounds_; }
-
- private:
-  void SetNew(const FilterOperations& filters,
-              const gfx::RectF& bounds,
-              const gfx::PointF& origin);
-
-  FilterOperations filters_;
-  gfx::RectF bounds_;
-  gfx::PointF origin_;
+  const FilterOperations filters;
+  const gfx::RectF bounds;
+  const gfx::PointF origin;
 };
 
 class CC_EXPORT EndFilterDisplayItem : public DisplayItem {
@@ -53,13 +37,6 @@ class CC_EXPORT EndFilterDisplayItem : public DisplayItem {
   EndFilterDisplayItem();
   ~EndFilterDisplayItem() override;
 
-  static std::unique_ptr<EndFilterDisplayItem> Create() {
-    return base::MakeUnique<EndFilterDisplayItem>();
-  }
-
-  void Raster(SkCanvas* canvas,
-              SkPicture::AbortCallback* callback) const override;
-
   int ApproximateOpCount() const { return 0; }
 };