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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/proto/skia_conversions.cc
diff --git a/cc/proto/skia_conversions.cc b/cc/proto/skia_conversions.cc
index e1fae093e87abca8027acbdfe887ad760e70442c..72397de08bde6019f38974e3f89c3305ce8321d7 100644
--- a/cc/proto/skia_conversions.cc
+++ b/cc/proto/skia_conversions.cc
@@ -32,14 +32,8 @@ SkClipOp SkClipOpFromProto(proto::SkClipOp::Op op) {
return SkClipOp::kDifference;
case proto::SkClipOp::INTERSECT:
return SkClipOp::kIntersect;
- case proto::SkClipOp::UNION:
- return SkClipOp::kUnion;
- case proto::SkClipOp::XOR:
- return SkClipOp::kXOR;
- case proto::SkClipOp::REVERSE_DIFFERENCE:
- return SkClipOp::kReverseDifference;
- case proto::SkClipOp::REPLACE:
- return SkClipOp::kReplace;
+ default:
+ break;
}
return SkClipOp::kDifference;
}
@@ -50,14 +44,8 @@ proto::SkClipOp::Op SkClipOpToProto(SkClipOp op) {
return proto::SkClipOp::DIFFERENCE_;
case SkClipOp::kIntersect:
return proto::SkClipOp::INTERSECT;
- case SkClipOp::kUnion:
- return proto::SkClipOp::UNION;
- case SkClipOp::kXOR:
- return proto::SkClipOp::XOR;
- case SkClipOp::kReverseDifference:
- return proto::SkClipOp::REVERSE_DIFFERENCE;
- case SkClipOp::kReplace:
- return proto::SkClipOp::REPLACE;
+ default:
+ break;
}
return proto::SkClipOp::DIFFERENCE_;
}
« 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