| 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/SkRegion.h" | 11 #include "third_party/skia/include/core/SkRegion.h" |
| 12 #include "third_party/skia/include/core/SkXfermode.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 class SkXferMode; | 16 class SkXferMode; |
| 17 | 17 |
| 18 namespace cc { | 18 namespace cc { |
| 19 | 19 |
| 20 namespace proto { | 20 namespace proto { |
| 21 class SkRRect; | 21 class SkRRect; |
| 22 } | 22 } |
| 23 | 23 |
| 24 // TODO(dtrainor): Move these to a class and make them static |
| 25 // (crbug.com/548432). |
| 24 CC_EXPORT SkRegion::Op SkRegionOpFromProto(proto::SkRegion::Op op); | 26 CC_EXPORT SkRegion::Op SkRegionOpFromProto(proto::SkRegion::Op op); |
| 25 CC_EXPORT proto::SkRegion::Op SkRegionOpToProto(SkRegion::Op op); | 27 CC_EXPORT proto::SkRegion::Op SkRegionOpToProto(SkRegion::Op op); |
| 26 | 28 |
| 27 CC_EXPORT SkXfermode::Mode SkXfermodeModeFromProto( | 29 CC_EXPORT SkXfermode::Mode SkXfermodeModeFromProto( |
| 28 proto::SkXfermode::Mode mode); | 30 proto::SkXfermode::Mode mode); |
| 29 CC_EXPORT proto::SkXfermode::Mode SkXfermodeModeToProto(SkXfermode::Mode mode); | 31 CC_EXPORT proto::SkXfermode::Mode SkXfermodeModeToProto(SkXfermode::Mode mode); |
| 30 | 32 |
| 31 CC_EXPORT void SkRRectToProto(const SkRRect& rect, proto::SkRRect* proto); | 33 CC_EXPORT void SkRRectToProto(const SkRRect& rect, proto::SkRRect* proto); |
| 32 CC_EXPORT SkRRect ProtoToSkRRect(const proto::SkRRect& proto); | 34 CC_EXPORT SkRRect ProtoToSkRRect(const proto::SkRRect& proto); |
| 33 | 35 |
| 34 } // namespace cc | 36 } // namespace cc |
| 35 | 37 |
| 36 #endif // CC_PROTO_SKIA_CONVERSIONS_H_ | 38 #endif // CC_PROTO_SKIA_CONVERSIONS_H_ |
| OLD | NEW |