cc/proto/skia_conversions.h - Issue 2502373003: stop using SkXfermode -- use SkBlendMode instead

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/proto/skia_conversions.h

Issue 2502373003: stop using SkXfermode -- use SkBlendMode instead (Closed)

Patch Set: rebase Created 4 years, 1 month ago

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

Jump to:

Index: cc/proto/skia_conversions.h

diff --git a/cc/proto/skia_conversions.h b/cc/proto/skia_conversions.h

index b7adf1d32db8ae0204887c2575eb814c5f629fea..402fa4e241669b00cf228c637d196477d5262a0c 100644

--- a/cc/proto/skia_conversions.h

+++ b/cc/proto/skia_conversions.h

@@ -8,8 +8,8 @@

#include "cc/base/cc_export.h"

#include "cc/proto/skregion.pb.h"

#include "cc/proto/skxfermode.pb.h"

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

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

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

class SkRegion;

class SkRRect;

@@ -25,9 +25,8 @@ class SkRRect;

CC_EXPORT SkRegion::Op SkRegionOpFromProto(proto::SkRegion::Op op);

CC_EXPORT proto::SkRegion::Op SkRegionOpToProto(SkRegion::Op op);

-CC_EXPORT SkXfermode::Mode SkXfermodeModeFromProto(

- proto::SkXfermode::Mode mode);

-CC_EXPORT proto::SkXfermode::Mode SkXfermodeModeToProto(SkXfermode::Mode mode);

+CC_EXPORT SkBlendMode SkXfermodeModeFromProto(proto::SkXfermode::Mode mode);

+CC_EXPORT proto::SkXfermode::Mode SkXfermodeModeToProto(SkBlendMode mode);

CC_EXPORT void SkRRectToProto(const SkRRect& rect, proto::SkRRect* proto);

CC_EXPORT SkRRect ProtoToSkRRect(const proto::SkRRect& proto);

« no previous file with comments | « cc/playback/display_item_list_unittest.cc ('k') | cc/proto/skia_conversions.cc » ('j') | no next file with comments »