cc: Move DisplayItem::Raster up to DisplayItemList

cc/playback/clip_display_item.h

 // 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.
 
 #ifndef CC_PLAYBACK_CLIP_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_CLIP_DISPLAY_ITEM_H_
 
 #include <stddef.h>
 
-#include <memory>
 #include <vector>
 
 #include "cc/base/cc_export.h"
 #include "cc/playback/display_item.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "ui/gfx/geometry/rect.h"
 
-class SkCanvas;
-
 namespace cc {
 
 class CC_EXPORT ClipDisplayItem : public DisplayItem {
  public:
   ClipDisplayItem(const gfx::Rect& clip_rect,
-                  const std::vector<SkRRect>& rounded_clip_rects,
+                  std::vector<SkRRect> rounded_clip_rects,
                   bool antialias);
   ~ClipDisplayItem() override;
 
-  void Raster(SkCanvas* canvas,
-              SkPicture::AbortCallback* callback) const override;
-
   size_t ExternalMemoryUsage() const {
-    return rounded_clip_rects_.capacity() * sizeof(rounded_clip_rects_[0]);
+    return rounded_clip_rects.capacity() * sizeof(rounded_clip_rects[0]);
   }
   int ApproximateOpCount() const { return 1; }
 
-  const gfx::Rect& clip_rect() const { return clip_rect_; }
-  const std::vector<SkRRect>& rounded_clip_rects() const {
-    return rounded_clip_rects_;
-  }
-
- private:
-  void SetNew(const gfx::Rect& clip_rect,
-              const std::vector<SkRRect>& rounded_clip_rects,
-              bool antialias);
-
-  gfx::Rect clip_rect_;
-  std::vector<SkRRect> rounded_clip_rects_;
-  bool antialias_;
+  const gfx::Rect clip_rect;
+  const std::vector<SkRRect> rounded_clip_rects;
+  const bool antialias;
 };
 
 class CC_EXPORT EndClipDisplayItem : public DisplayItem {
  public:
   EndClipDisplayItem();
   ~EndClipDisplayItem() override;
 
-  void Raster(SkCanvas* canvas,
-              SkPicture::AbortCallback* callback) const override;
-
   int ApproximateOpCount() const { return 0; }
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_CLIP_DISPLAY_ITEM_H_