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

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

Issue 2572833002: stop using exotic clipops (Closed)
Patch Set: cleaner SkUserConfig.h edit 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_unittest.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 #include "cc/proto/skia_conversions.h" 5 #include "cc/proto/skia_conversions.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "cc/proto/gfx_conversions.h" 8 #include "cc/proto/gfx_conversions.h"
9 #include "cc/proto/skclipop.pb.h" 9 #include "cc/proto/skclipop.pb.h"
10 #include "cc/proto/skrrect.pb.h" 10 #include "cc/proto/skrrect.pb.h"
(...skipping 14 matching lines...) Expand all
25 } 25 }
26 26
27 } // namespace 27 } // namespace
28 28
29 SkClipOp SkClipOpFromProto(proto::SkClipOp::Op op) { 29 SkClipOp SkClipOpFromProto(proto::SkClipOp::Op op) {
30 switch (op) { 30 switch (op) {
31 case proto::SkClipOp::DIFFERENCE_: 31 case proto::SkClipOp::DIFFERENCE_:
32 return SkClipOp::kDifference; 32 return SkClipOp::kDifference;
33 case proto::SkClipOp::INTERSECT: 33 case proto::SkClipOp::INTERSECT:
34 return SkClipOp::kIntersect; 34 return SkClipOp::kIntersect;
35 case proto::SkClipOp::UNION: 35 default:
36 return SkClipOp::kUnion; 36 break;
37 case proto::SkClipOp::XOR:
38 return SkClipOp::kXOR;
39 case proto::SkClipOp::REVERSE_DIFFERENCE:
40 return SkClipOp::kReverseDifference;
41 case proto::SkClipOp::REPLACE:
42 return SkClipOp::kReplace;
43 } 37 }
44 return SkClipOp::kDifference; 38 return SkClipOp::kDifference;
45 } 39 }
46 40
47 proto::SkClipOp::Op SkClipOpToProto(SkClipOp op) { 41 proto::SkClipOp::Op SkClipOpToProto(SkClipOp op) {
48 switch (op) { 42 switch (op) {
49 case SkClipOp::kDifference: 43 case SkClipOp::kDifference:
50 return proto::SkClipOp::DIFFERENCE_; 44 return proto::SkClipOp::DIFFERENCE_;
51 case SkClipOp::kIntersect: 45 case SkClipOp::kIntersect:
52 return proto::SkClipOp::INTERSECT; 46 return proto::SkClipOp::INTERSECT;
53 case SkClipOp::kUnion: 47 default:
54 return proto::SkClipOp::UNION; 48 break;
55 case SkClipOp::kXOR:
56 return proto::SkClipOp::XOR;
57 case SkClipOp::kReverseDifference:
58 return proto::SkClipOp::REVERSE_DIFFERENCE;
59 case SkClipOp::kReplace:
60 return proto::SkClipOp::REPLACE;
61 } 49 }
62 return proto::SkClipOp::DIFFERENCE_; 50 return proto::SkClipOp::DIFFERENCE_;
63 } 51 }
64 52
65 SkBlendMode SkXfermodeModeFromProto(proto::SkXfermode::Mode mode) { 53 SkBlendMode SkXfermodeModeFromProto(proto::SkXfermode::Mode mode) {
66 switch (mode) { 54 switch (mode) {
67 case proto::SkXfermode::CLEAR_: 55 case proto::SkXfermode::CLEAR_:
68 return SkBlendMode::kClear; 56 return SkBlendMode::kClear;
69 case proto::SkXfermode::SRC: 57 case proto::SkXfermode::SRC:
70 return SkBlendMode::kSrc; 58 return SkBlendMode::kSrc;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 parsed_radii[SkRRect::kLowerRight_Corner] = 201 parsed_radii[SkRRect::kLowerRight_Corner] =
214 ProtoToSkPoint(proto.radii_lower_right()); 202 ProtoToSkPoint(proto.radii_lower_right());
215 parsed_radii[SkRRect::kLowerLeft_Corner] = 203 parsed_radii[SkRRect::kLowerLeft_Corner] =
216 ProtoToSkPoint(proto.radii_lower_left()); 204 ProtoToSkPoint(proto.radii_lower_left());
217 SkRRect rect; 205 SkRRect rect;
218 rect.setRectRadii(parsed_rect, parsed_radii); 206 rect.setRectRadii(parsed_rect, parsed_radii);
219 return rect; 207 return rect;
220 } 208 }
221 209
222 } // namespace cc 210 } // namespace cc
OLDNEW
« no previous file with comments | « cc/playback/display_item_list_unittest.cc ('k') | cc/proto/skia_conversions_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698