cc/playback/compositing_display_item.h - Issue 1829093002: Use sk_sp-based APIs for SkColorFilter

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/playback/compositing_display_item.h

Issue 1829093002: Use sk_sp-based APIs for SkColorFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Respond to reviews Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/playback/compositing_display_item.cc » ('j') | third_party/WebKit/Source/platform/graphics/GraphicsContextState.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/playback/compositing_display_item.h

diff --git a/cc/playback/compositing_display_item.h b/cc/playback/compositing_display_item.h

index d723ce10e16e227a04867f92828e6b2f7ee9a2f5..cf6722206f588b84f32a5b12b72f2d10d1fb7296 100644

--- a/cc/playback/compositing_display_item.h

+++ b/cc/playback/compositing_display_item.h

@@ -11,9 +11,9 @@

#include "base/memory/scoped_ptr.h"

#include "cc/base/cc_export.h"

#include "cc/playback/display_item.h"

-#include "skia/ext/refptr.h"

#include "third_party/skia/include/core/SkColorFilter.h"

#include "third_party/skia/include/core/SkRect.h"

+#include "third_party/skia/include/core/SkRefCnt.h"

#include "third_party/skia/include/core/SkXfermode.h"

#include "ui/gfx/geometry/rect_f.h"

@@ -27,7 +27,7 @@ class CC_EXPORT CompositingDisplayItem : public DisplayItem {

CompositingDisplayItem(uint8_t alpha,

SkXfermode::Mode xfermode,

SkRect* bounds,

- skia::RefPtr<SkColorFilter> color_filter,

+ sk_sp<SkColorFilter> color_filter,

bool lcd_text_requires_opaque_layer);

explicit CompositingDisplayItem(const proto::DisplayItem& proto);

~CompositingDisplayItem() override;

@@ -49,14 +49,14 @@ class CC_EXPORT CompositingDisplayItem : public DisplayItem {

void SetNew(uint8_t alpha,

SkXfermode::Mode xfermode,

SkRect* bounds,

- skia::RefPtr<SkColorFilter> color_filter,

+ sk_sp<SkColorFilter> color_filter,

bool lcd_text_requires_opaque_layer);

uint8_t alpha_;

SkXfermode::Mode xfermode_;

bool has_bounds_;

SkRect bounds_;

- skia::RefPtr<SkColorFilter> color_filter_;

+ sk_sp<SkColorFilter> color_filter_;

bool lcd_text_requires_opaque_layer_;

};