OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_BASE_REGION_H_ | 5 #ifndef CC_BASE_REGION_H_ |
6 #define CC_BASE_REGION_H_ | 6 #define CC_BASE_REGION_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "cc/base/cc_export.h" | 11 #include "cc/base/cc_export.h" |
12 #include "third_party/skia/include/core/SkRegion.h" | 12 #include "third_party/skia/include/core/SkRegion.h" |
13 #include "ui/gfx/geometry/rect.h" | 13 #include "ui/gfx/geometry/rect.h" |
14 #include "ui/gfx/skia_util.h" | 14 #include "ui/gfx/skia_util.h" |
15 | 15 |
16 namespace base { | 16 namespace base { |
17 class Value; | 17 class Value; |
| 18 namespace trace_event { |
| 19 class TracedValue; |
| 20 } |
| 21 |
18 namespace debug { | 22 namespace debug { |
19 class TracedValue; | 23 using ::base::trace_event::TracedValue; |
20 } | 24 } |
21 } | 25 } |
22 | 26 |
23 namespace cc { | 27 namespace cc { |
24 class SimpleEnclosedRegion; | 28 class SimpleEnclosedRegion; |
25 | 29 |
26 class CC_EXPORT Region { | 30 class CC_EXPORT Region { |
27 public: | 31 public: |
28 Region(); | 32 Region(); |
29 Region(const Region& region); | 33 Region(const Region& region); |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 | 135 |
132 inline Region UnionRegions(const Region& a, const gfx::Rect& b) { | 136 inline Region UnionRegions(const Region& a, const gfx::Rect& b) { |
133 Region result = a; | 137 Region result = a; |
134 result.Union(b); | 138 result.Union(b); |
135 return result; | 139 return result; |
136 } | 140 } |
137 | 141 |
138 } // namespace cc | 142 } // namespace cc |
139 | 143 |
140 #endif // CC_BASE_REGION_H_ | 144 #endif // CC_BASE_REGION_H_ |
OLD | NEW |