SkClipOp is an enum class now

cc/proto/skia_conversions.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/proto/skia_conversions.h"
 
 #include "base/logging.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/skclipop.pb.h"
 #include "cc/proto/skrrect.pb.h"
@@ skipping 11 matching lines @@
 SkPoint ProtoToSkPoint(const proto::PointF& proto) {
   gfx::PointF point = ProtoToPointF(proto);
   return SkPoint::Make(point.x(), point.y());
 }
 
 }  // namespace
 
 SkClipOp SkClipOpFromProto(proto::SkClipOp::Op op) {
   switch (op) {
     case proto::SkClipOp::DIFFERENCE_:
-      return kDifference_SkClipOp;
+      return SkClipOp::kDifference;
     case proto::SkClipOp::INTERSECT:
-      return kIntersect_SkClipOp;
+      return SkClipOp::kIntersect;
     case proto::SkClipOp::UNION:
-      return kUnion_SkClipOp;
+      return SkClipOp::kUnion;
     case proto::SkClipOp::XOR:
-      return kXOR_SkClipOp;
+      return SkClipOp::kXOR;
     case proto::SkClipOp::REVERSE_DIFFERENCE:
-      return kReverseDifference_SkClipOp;
+      return SkClipOp::kReverseDifference;
     case proto::SkClipOp::REPLACE:
-      return kReplace_SkClipOp;
+      return SkClipOp::kReplace;
   }
-  return kDifference_SkClipOp;
+  return SkClipOp::kDifference;
 }
 
 proto::SkClipOp::Op SkClipOpToProto(SkClipOp op) {
   switch (op) {
-    case kDifference_SkClipOp:
+    case SkClipOp::kDifference:
       return proto::SkClipOp::DIFFERENCE_;
-    case kIntersect_SkClipOp:
+    case SkClipOp::kIntersect:
       return proto::SkClipOp::INTERSECT;
-    case kUnion_SkClipOp:
+    case SkClipOp::kUnion:
       return proto::SkClipOp::UNION;
-    case kXOR_SkClipOp:
+    case SkClipOp::kXOR:
       return proto::SkClipOp::XOR;
-    case kReverseDifference_SkClipOp:
+    case SkClipOp::kReverseDifference:
       return proto::SkClipOp::REVERSE_DIFFERENCE;
-    case kReplace_SkClipOp:
+    case SkClipOp::kReplace:
       return proto::SkClipOp::REPLACE;
   }
   return proto::SkClipOp::DIFFERENCE_;
 }
 
 SkBlendMode SkXfermodeModeFromProto(proto::SkXfermode::Mode mode) {
   switch (mode) {
     case proto::SkXfermode::CLEAR_:
       return SkBlendMode::kClear;
     case proto::SkXfermode::SRC:
@@ skipping 143 matching lines @@
   parsed_radii[SkRRect::kLowerRight_Corner] =
       ProtoToSkPoint(proto.radii_lower_right());
   parsed_radii[SkRRect::kLowerLeft_Corner] =
       ProtoToSkPoint(proto.radii_lower_left());
   SkRRect rect;
   rect.setRectRadii(parsed_rect, parsed_radii);
   return rect;
 }
 
 }  // namespace cc