| Index: cc/resources/managed_tile_state.h
|
| diff --git a/cc/resources/managed_tile_state.h b/cc/resources/managed_tile_state.h
|
| index faa7c63a3b2ce6cf82e12ca2a6f45b07fcf4794e..44784eed6c8cbcd77414a38776ea49273283dee3 100644
|
| --- a/cc/resources/managed_tile_state.h
|
| +++ b/cc/resources/managed_tile_state.h
|
| @@ -7,7 +7,6 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "cc/resources/platform_color.h"
|
| -#include "cc/resources/raster_mode.h"
|
| #include "cc/resources/rasterizer.h"
|
| #include "cc/resources/resource_pool.h"
|
| #include "cc/resources/resource_provider.h"
|
| @@ -38,12 +37,12 @@ scoped_ptr<base::Value> ManagedTileBinAsValue(ManagedTileBin bin);
|
| // managed by the TileManager.
|
| class CC_EXPORT ManagedTileState {
|
| public:
|
| - class CC_EXPORT TileVersion {
|
| + class CC_EXPORT TileDrawInfo {
|
| public:
|
| enum Mode { RESOURCE_MODE, SOLID_COLOR_MODE, PICTURE_PILE_MODE };
|
|
|
| - TileVersion();
|
| - ~TileVersion();
|
| + TileDrawInfo();
|
| + ~TileDrawInfo();
|
|
|
| Mode mode() const { return mode_; }
|
|
|
| @@ -107,8 +106,7 @@ class CC_EXPORT ManagedTileState {
|
| void AsValueInto(base::debug::TracedValue* dict) const;
|
|
|
| // Persisted state: valid all the time.
|
| - TileVersion tile_versions[NUM_RASTER_MODES];
|
| - RasterMode raster_mode;
|
| + TileDrawInfo draw_info_;
|
|
|
| ManagedTileBin bin;
|
|
|
|
|