OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_INPUT_LAYER_SELECTION_BOUND_H_ | 5 #ifndef CC_INPUT_LAYER_SELECTION_BOUND_H_ |
6 #define CC_INPUT_LAYER_SELECTION_BOUND_H_ | 6 #define CC_INPUT_LAYER_SELECTION_BOUND_H_ |
7 | 7 |
8 #include "cc/base/cc_export.h" | 8 #include "cc/base/cc_export.h" |
9 #include "cc/input/selection.h" | 9 #include "cc/input/selection.h" |
10 #include "cc/input/selection_bound_type.h" | |
11 #include "ui/gfx/geometry/point.h" | 10 #include "ui/gfx/geometry/point.h" |
| 11 #include "ui/gfx/selection_bound.h" |
12 | 12 |
13 namespace cc { | 13 namespace cc { |
14 | 14 |
15 namespace proto { | 15 namespace proto { |
16 class LayerSelection; | 16 class LayerSelection; |
17 class LayerSelectionBound; | 17 class LayerSelectionBound; |
18 } // namespace proto | 18 } // namespace proto |
19 | 19 |
20 // Marker for a selection end-point attached to a specific layer. | 20 // Marker for a selection end-point attached to a specific layer. |
| 21 // TODO(fsamuel): This could be unified with gfx::SelectionBound. |
21 struct CC_EXPORT LayerSelectionBound { | 22 struct CC_EXPORT LayerSelectionBound { |
22 LayerSelectionBound(); | 23 LayerSelectionBound(); |
23 ~LayerSelectionBound(); | 24 ~LayerSelectionBound(); |
24 | 25 |
25 SelectionBoundType type; | 26 gfx::SelectionBound::Type type; |
26 gfx::Point edge_top; | 27 gfx::Point edge_top; |
27 gfx::Point edge_bottom; | 28 gfx::Point edge_bottom; |
28 int layer_id; | 29 int layer_id; |
29 | 30 |
30 bool operator==(const LayerSelectionBound& other) const; | 31 bool operator==(const LayerSelectionBound& other) const; |
31 bool operator!=(const LayerSelectionBound& other) const; | 32 bool operator!=(const LayerSelectionBound& other) const; |
32 | 33 |
33 void ToProtobuf(proto::LayerSelectionBound* proto) const; | 34 void ToProtobuf(proto::LayerSelectionBound* proto) const; |
34 void FromProtobuf(const proto::LayerSelectionBound& proto); | 35 void FromProtobuf(const proto::LayerSelectionBound& proto); |
35 }; | 36 }; |
36 | 37 |
37 typedef Selection<LayerSelectionBound> LayerSelection; | 38 typedef Selection<LayerSelectionBound> LayerSelection; |
38 | 39 |
39 CC_EXPORT void LayerSelectionToProtobuf(const LayerSelection& selection, | 40 CC_EXPORT void LayerSelectionToProtobuf(const LayerSelection& selection, |
40 proto::LayerSelection* proto); | 41 proto::LayerSelection* proto); |
41 CC_EXPORT void LayerSelectionFromProtobuf(LayerSelection* selection, | 42 CC_EXPORT void LayerSelectionFromProtobuf(LayerSelection* selection, |
42 const proto::LayerSelection& proto); | 43 const proto::LayerSelection& proto); |
43 | 44 |
44 } // namespace cc | 45 } // namespace cc |
45 | 46 |
46 #endif // CC_INPUT_LAYER_SELECTION_BOUND_H_ | 47 #endif // CC_INPUT_LAYER_SELECTION_BOUND_H_ |
OLD | NEW |