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" | 10 #include "cc/input/selection_bound_type.h" |
11 #include "ui/gfx/geometry/point.h" | 11 #include "ui/gfx/geometry/point.h" |
12 | 12 |
13 namespace cc { | 13 namespace cc { |
14 | 14 |
15 namespace proto { | |
16 class LayerSelectionBound; | |
17 } // namespace proto | |
18 | |
15 // Marker for a selection end-point attached to a specific layer. | 19 // Marker for a selection end-point attached to a specific layer. |
16 struct CC_EXPORT LayerSelectionBound { | 20 struct CC_EXPORT LayerSelectionBound { |
17 LayerSelectionBound(); | 21 LayerSelectionBound(); |
18 ~LayerSelectionBound(); | 22 ~LayerSelectionBound(); |
19 | 23 |
20 SelectionBoundType type; | 24 SelectionBoundType type; |
21 gfx::Point edge_top; | 25 gfx::Point edge_top; |
22 gfx::Point edge_bottom; | 26 gfx::Point edge_bottom; |
23 int layer_id; | 27 int layer_id; |
28 | |
29 void ToProtobuf(proto::LayerSelectionBound* proto) const; | |
30 void FromProtobuf(const proto::LayerSelectionBound& proto); | |
24 }; | 31 }; |
25 | 32 |
26 bool operator==(const LayerSelectionBound& lhs, const LayerSelectionBound& rhs); | 33 CC_EXPORT bool operator==(const LayerSelectionBound& lhs, |
vmpstr
2015/12/18 07:46:02
While here, did you want to just make these member
nyquist
2015/12/18 18:53:13
Done. I tried before I uploaded, but I realize I m
| |
27 bool operator!=(const LayerSelectionBound& lhs, const LayerSelectionBound& rhs); | 34 const LayerSelectionBound& rhs); |
35 CC_EXPORT bool operator!=(const LayerSelectionBound& lhs, | |
36 const LayerSelectionBound& rhs); | |
28 | 37 |
29 typedef Selection<LayerSelectionBound> LayerSelection; | 38 typedef Selection<LayerSelectionBound> LayerSelection; |
30 | 39 |
31 } // namespace cc | 40 } // namespace cc |
32 | 41 |
33 #endif // CC_INPUT_LAYER_SELECTION_BOUND_H_ | 42 #endif // CC_INPUT_LAYER_SELECTION_BOUND_H_ |
OLD | NEW |