| 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_REGION_H_ | 5 #ifndef CC_BASE_REGION_H_ |
| 6 #define CC_REGION_H_ | 6 #define CC_BASE_REGION_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "cc/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/rect.h" |
| 14 #include "ui/gfx/skia_util.h" | 14 #include "ui/gfx/skia_util.h" |
| 15 | 15 |
| 16 namespace cc { | 16 namespace cc { |
| 17 | 17 |
| 18 class CC_EXPORT Region { | 18 class CC_EXPORT Region { |
| 19 public: | 19 public: |
| 20 Region(); | 20 Region(); |
| 21 Region(const Region& region); | 21 Region(const Region& region); |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 } | 118 } |
| 119 | 119 |
| 120 inline Region UnionRegions(const Region& a, gfx::Rect b) { | 120 inline Region UnionRegions(const Region& a, gfx::Rect b) { |
| 121 Region result = a; | 121 Region result = a; |
| 122 result.Union(b); | 122 result.Union(b); |
| 123 return result; | 123 return result; |
| 124 } | 124 } |
| 125 | 125 |
| 126 } // namespace cc | 126 } // namespace cc |
| 127 | 127 |
| 128 #endif // CC_REGION_H_ | 128 #endif // CC_BASE_REGION_H_ |
| OLD | NEW |