| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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_RESOURCES_PICTURE_LAYER_TILING_H_ | 5 #ifndef CC_RESOURCES_PICTURE_LAYER_TILING_H_ |
| 6 #define CC_RESOURCES_PICTURE_LAYER_TILING_H_ | 6 #define CC_RESOURCES_PICTURE_LAYER_TILING_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/containers/hash_tables.h" | 13 #include "base/containers/hash_tables.h" |
| 14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 15 #include "cc/base/cc_export.h" | 15 #include "cc/base/cc_export.h" |
| 16 #include "cc/base/region.h" | 16 #include "cc/base/region.h" |
| 17 #include "cc/base/tiling_data.h" | 17 #include "cc/base/tiling_data.h" |
| 18 #include "cc/resources/tile.h" | 18 #include "cc/resources/tile.h" |
| 19 #include "cc/resources/tile_priority.h" | 19 #include "cc/resources/tile_priority.h" |
| 20 #include "cc/trees/occlusion.h" | 20 #include "cc/trees/occlusion.h" |
| 21 #include "ui/gfx/geometry/rect.h" | 21 #include "ui/gfx/geometry/rect.h" |
| 22 | 22 |
| 23 namespace base { | 23 namespace base { |
| 24 namespace debug { | 24 namespace trace_event { |
| 25 class TracedValue; | 25 class TracedValue; |
| 26 } | 26 } |
| 27 |
| 28 // TODO(ssid): remove these aliases after the tracing clients are moved to the |
| 29 // new trace_event namespace. See crbug.com/451032. ETA: March 2015 |
| 30 namespace debug { |
| 31 using ::base::trace_event::TracedValue; |
| 27 } | 32 } |
| 33 } // namespace base |
| 28 | 34 |
| 29 namespace cc { | 35 namespace cc { |
| 30 | 36 |
| 31 class PictureLayerTiling; | 37 class PictureLayerTiling; |
| 32 class RasterSource; | 38 class RasterSource; |
| 33 | 39 |
| 34 class CC_EXPORT PictureLayerTilingClient { | 40 class CC_EXPORT PictureLayerTilingClient { |
| 35 public: | 41 public: |
| 36 // Create a tile at the given content_rect (in the contents scale of the | 42 // Create a tile at the given content_rect (in the contents scale of the |
| 37 // tiling) This might return null if the client cannot create such a tile. | 43 // tiling) This might return null if the client cannot create such a tile. |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 | 323 |
| 318 private: | 324 private: |
| 319 DISALLOW_ASSIGN(PictureLayerTiling); | 325 DISALLOW_ASSIGN(PictureLayerTiling); |
| 320 | 326 |
| 321 RectExpansionCache expansion_cache_; | 327 RectExpansionCache expansion_cache_; |
| 322 }; | 328 }; |
| 323 | 329 |
| 324 } // namespace cc | 330 } // namespace cc |
| 325 | 331 |
| 326 #endif // CC_RESOURCES_PICTURE_LAYER_TILING_H_ | 332 #endif // CC_RESOURCES_PICTURE_LAYER_TILING_H_ |
| OLD | NEW |