| 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_CC_CONVERSIONS_H_ | 5 #ifndef CC_PROTO_CC_CONVERSIONS_H_ |
| 6 #define CC_PROTO_CC_CONVERSIONS_H_ | 6 #define CC_PROTO_CC_CONVERSIONS_H_ |
| 7 | 7 |
| 8 #include "cc/base/cc_export.h" | 8 #include "cc/base/cc_export.h" |
| 9 #include "cc/input/scrollbar.h" | 9 #include "cc/input/scrollbar.h" |
| 10 #include "cc/proto/layer.pb.h" | 10 #include "cc/proto/layer.pb.h" |
| 11 #include "cc/proto/property_tree.pb.h" |
| 12 #include "cc/trees/clip_node.h" |
| 11 | 13 |
| 12 namespace cc { | 14 namespace cc { |
| 13 class Region; | 15 class Region; |
| 14 | 16 |
| 15 namespace proto { | 17 namespace proto { |
| 16 class Region; | 18 class Region; |
| 17 } // namespace proto | 19 } // namespace proto |
| 18 | 20 |
| 19 // TODO(dtrainor): Move these to a class and make them static | 21 // TODO(dtrainor): Move these to a class and make them static |
| 20 // (crbug.com/548432). | 22 // (crbug.com/548432). |
| 21 CC_EXPORT void RegionToProto(const Region& region, proto::Region* proto); | 23 CC_EXPORT void RegionToProto(const Region& region, proto::Region* proto); |
| 22 CC_EXPORT Region RegionFromProto(const proto::Region& proto); | 24 CC_EXPORT Region RegionFromProto(const proto::Region& proto); |
| 23 | 25 |
| 24 // Conversion methods for ScrollbarOrientation. | 26 // Conversion methods for ScrollbarOrientation. |
| 25 CC_EXPORT proto::SolidColorScrollbarLayerProperties::ScrollbarOrientation | 27 CC_EXPORT proto::SolidColorScrollbarLayerProperties::ScrollbarOrientation |
| 26 ScrollbarOrientationToProto(const ScrollbarOrientation& orientation); | 28 ScrollbarOrientationToProto(const ScrollbarOrientation& orientation); |
| 27 CC_EXPORT ScrollbarOrientation ScrollbarOrientationFromProto( | 29 CC_EXPORT ScrollbarOrientation ScrollbarOrientationFromProto( |
| 28 const proto::SolidColorScrollbarLayerProperties::ScrollbarOrientation& | 30 const proto::SolidColorScrollbarLayerProperties::ScrollbarOrientation& |
| 29 proto); | 31 proto); |
| 30 | 32 |
| 33 proto::ClipNodeData::ClipType ClipNodeTypeToProto( |
| 34 const ClipNode::ClipType& clip_type); |
| 35 ClipNode::ClipType ClipNodeTypeFromProto( |
| 36 const proto::ClipNodeData::ClipType& clip_type); |
| 37 |
| 31 } // namespace cc | 38 } // namespace cc |
| 32 | 39 |
| 33 #endif // CC_PROTO_CC_CONVERSIONS_H_ | 40 #endif // CC_PROTO_CC_CONVERSIONS_H_ |
| OLD | NEW |