Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

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

Issue 2575583002: Remove ClipPathDisplayItem::clip_op_ (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
« no previous file with comments | « cc/playback/display_item_list_unittest.cc ('k') | cc/proto/skia_conversions.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/skclipop.pb.h" 9 #include "cc/proto/skclipop.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/SkBlendMode.h"
12 #include "third_party/skia/include/core/SkClipOp.h" 12 #include "third_party/skia/include/core/SkClipOp.h"
13 13
14 class SkRRect; 14 class SkRRect;
15 15
16 namespace cc { 16 namespace cc {
17 17
18 namespace proto { 18 namespace proto {
19 class SkRRect; 19 class SkRRect;
20 } 20 }
21 21
22 // TODO(dtrainor): Move these to a class and make them static 22 // TODO(dtrainor): Move these to a class and make them static
23 // (crbug.com/548432). 23 // (crbug.com/548432).
24 CC_EXPORT SkClipOp SkClipOpFromProto(proto::SkClipOp::Op op);
25 CC_EXPORT proto::SkClipOp::Op SkClipOpToProto(SkClipOp op);
26
27 CC_EXPORT SkBlendMode SkXfermodeModeFromProto(proto::SkXfermode::Mode mode); 24 CC_EXPORT SkBlendMode SkXfermodeModeFromProto(proto::SkXfermode::Mode mode);
28 CC_EXPORT proto::SkXfermode::Mode SkXfermodeModeToProto(SkBlendMode mode); 25 CC_EXPORT proto::SkXfermode::Mode SkXfermodeModeToProto(SkBlendMode mode);
29 26
30 CC_EXPORT void SkRRectToProto(const SkRRect& rect, proto::SkRRect* proto); 27 CC_EXPORT void SkRRectToProto(const SkRRect& rect, proto::SkRRect* proto);
31 CC_EXPORT SkRRect ProtoToSkRRect(const proto::SkRRect& proto); 28 CC_EXPORT SkRRect ProtoToSkRRect(const proto::SkRRect& proto);
32 29
33 } // namespace cc 30 } // namespace cc
34 31
35 #endif // CC_PROTO_SKIA_CONVERSIONS_H_ 32 #endif // CC_PROTO_SKIA_CONVERSIONS_H_
OLDNEW
« no previous file with comments | « cc/playback/display_item_list_unittest.cc ('k') | cc/proto/skia_conversions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698