cc: Move DisplayItem::Raster up to DisplayItemList

cc/playback/compositing_display_item.cc

Index: cc/playback/compositing_display_item.cc
diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc
index 77635bfe6285df7605ae81c44e0cacd230864e97..9f4c9e9c2844ea25464964f03c030bf3a910e87e 100644
--- a/cc/playback/compositing_display_item.cc
+++ b/cc/playback/compositing_display_item.cc
@@ -4,18 +4,7 @@
 
 #include "cc/playback/compositing_display_item.h"
 
-#include <stddef.h>
-#include <stdint.h>
-
-#include "base/strings/stringprintf.h"
-#include "base/trace_event/trace_event_argument.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkData.h"
-#include "third_party/skia/include/core/SkFlattenable.h"
-#include "third_party/skia/include/core/SkFlattenableSerialization.h"
-#include "third_party/skia/include/core/SkPaint.h"
-
-#include "ui/gfx/skia_util.h"
+#include "third_party/skia/include/core/SkColorFilter.h"
 
 namespace cc {
 
@@ -23,54 +12,21 @@ CompositingDisplayItem::CompositingDisplayItem(
     uint8_t alpha,
     SkBlendMode xfermode,
     SkRect* bounds,
-    sk_sp<SkColorFilter> cf,
+    sk_sp<SkColorFilter> color_filter,
     bool lcd_text_requires_opaque_layer)
-    : DisplayItem(COMPOSITING) {
-  SetNew(alpha, xfermode, bounds, std::move(cf),
-         lcd_text_requires_opaque_layer);
-}
-
-CompositingDisplayItem::~CompositingDisplayItem() {
-}
+    : DisplayItem(COMPOSITING),
+      alpha(alpha),
+      xfermode(xfermode),
+      has_bounds(!!bounds),
+      bounds(bounds ? SkRect(*bounds) : SkRect()),
+      color_filter(std::move(color_filter)),
+      lcd_text_requires_opaque_layer(lcd_text_requires_opaque_layer) {}
 
-void CompositingDisplayItem::SetNew(uint8_t alpha,
-                                    SkBlendMode xfermode,
-                                    SkRect* bounds,
-                                    sk_sp<SkColorFilter> cf,
-                                    bool lcd_text_requires_opaque_layer) {
-  alpha_ = alpha;
-  xfermode_ = xfermode;
-  has_bounds_ = !!bounds;
-  if (bounds)
-    bounds_ = SkRect(*bounds);
-  color_filter_ = std::move(cf);
-  lcd_text_requires_opaque_layer_ = lcd_text_requires_opaque_layer;
-}
-
-void CompositingDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
-  SkPaint paint;
-  paint.setBlendMode(xfermode_);
-  paint.setAlpha(alpha_);
-  paint.setColorFilter(color_filter_);
-  const SkRect* bounds = has_bounds_ ? &bounds_ : nullptr;
-  if (lcd_text_requires_opaque_layer_)
-    canvas->saveLayer(bounds, &paint);
-  else
-    canvas->saveLayerPreserveLCDTextRequests(bounds, &paint);
-}
+CompositingDisplayItem::~CompositingDisplayItem() = default;
 
 EndCompositingDisplayItem::EndCompositingDisplayItem()
     : DisplayItem(END_COMPOSITING) {}
 
-EndCompositingDisplayItem::~EndCompositingDisplayItem() {
-}
-
-void EndCompositingDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
-  canvas->restore();
-}
+EndCompositingDisplayItem::~EndCompositingDisplayItem() = default;
 
 }  // namespace cc