| Index: cc/paint/compositing_display_item.cc
|
| diff --git a/cc/playback/compositing_display_item.cc b/cc/paint/compositing_display_item.cc
|
| similarity index 87%
|
| rename from cc/playback/compositing_display_item.cc
|
| rename to cc/paint/compositing_display_item.cc
|
| index 77635bfe6285df7605ae81c44e0cacd230864e97..bb6bc31a6c74dab9c2b5c75c719f8020f1b7553a 100644
|
| --- a/cc/playback/compositing_display_item.cc
|
| +++ b/cc/paint/compositing_display_item.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "cc/playback/compositing_display_item.h"
|
| +#include "cc/paint/compositing_display_item.h"
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| @@ -30,8 +30,7 @@ CompositingDisplayItem::CompositingDisplayItem(
|
| lcd_text_requires_opaque_layer);
|
| }
|
|
|
| -CompositingDisplayItem::~CompositingDisplayItem() {
|
| -}
|
| +CompositingDisplayItem::~CompositingDisplayItem() {}
|
|
|
| void CompositingDisplayItem::SetNew(uint8_t alpha,
|
| SkBlendMode xfermode,
|
| @@ -47,9 +46,8 @@ void CompositingDisplayItem::SetNew(uint8_t alpha,
|
| lcd_text_requires_opaque_layer_ = lcd_text_requires_opaque_layer;
|
| }
|
|
|
| -void CompositingDisplayItem::Raster(
|
| - SkCanvas* canvas,
|
| - SkPicture::AbortCallback* callback) const {
|
| +void CompositingDisplayItem::Raster(SkCanvas* canvas,
|
| + SkPicture::AbortCallback* callback) const {
|
| SkPaint paint;
|
| paint.setBlendMode(xfermode_);
|
| paint.setAlpha(alpha_);
|
| @@ -64,8 +62,7 @@ void CompositingDisplayItem::Raster(
|
| EndCompositingDisplayItem::EndCompositingDisplayItem()
|
| : DisplayItem(END_COMPOSITING) {}
|
|
|
| -EndCompositingDisplayItem::~EndCompositingDisplayItem() {
|
| -}
|
| +EndCompositingDisplayItem::~EndCompositingDisplayItem() {}
|
|
|
| void EndCompositingDisplayItem::Raster(
|
| SkCanvas* canvas,
|
|
|