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

Side by Side Diff

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

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

Side by Side Diff: cc/proto/skia_conversions.h

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

Patch Set: rebase Created 4 years 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CC_PROTO_SKIA_CONVERSIONS_H_	5 #ifndef CC_PROTO_SKIA_CONVERSIONS_H_

6 #define CC_PROTO_SKIA_CONVERSIONS_H_	6 #define CC_PROTO_SKIA_CONVERSIONS_H_

7	7

8 #include "cc/base/cc_export.h"	8 #include "cc/base/cc_export.h"

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

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

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

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

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

13	13

14 class SkRegion;	14 class SkRegion;

15 class SkRRect;	15 class SkRRect;

16	16

17 namespace cc {	17 namespace cc {

18	18

19 namespace proto {	19 namespace proto {

20 class SkRRect;	20 class SkRRect;

21 }	21 }

22	22

23 // TODO(dtrainor): Move these to a class and make them static	23 // TODO(dtrainor): Move these to a class and make them static

24 // (crbug.com/548432).	24 // (crbug.com/548432).

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

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

27	27

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

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

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

31	30

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

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

34	33

35 } // namespace cc	34 } // namespace cc

36	35

37 #endif // CC_PROTO_SKIA_CONVERSIONS_H_	36 #endif // CC_PROTO_SKIA_CONVERSIONS_H_

OLD	NEW

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