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/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 debug { | 18 namespace debug { |
19 class TracedValue; | 19 class TracedValue; |
20 } | 20 } |
21 } | 21 } |
22 | 22 |
23 namespace cc { | 23 namespace cc { |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 | 131 |
132 inline Region UnionRegions(const Region& a, const gfx::Rect& b) { | 132 inline Region UnionRegions(const Region& a, const gfx::Rect& b) { |
133 Region result = a; | 133 Region result = a; |
134 result.Union(b); | 134 result.Union(b); |
135 return result; | 135 return result; |
136 } | 136 } |
137 | 137 |
138 } // namespace cc | 138 } // namespace cc |
139 | 139 |
140 #endif // CC_BASE_REGION_H_ | 140 #endif // CC_BASE_REGION_H_ |
OLD | NEW |