| Index: cc/tiles/tile_manager.h
|
| diff --git a/cc/tiles/tile_manager.h b/cc/tiles/tile_manager.h
|
| index c041ce24d3b657cac95aa17143ddf8b9b8d06d02..00f22e3af485787d49ab14bba7016aae11f4f819 100644
|
| --- a/cc/tiles/tile_manager.h
|
| +++ b/cc/tiles/tile_manager.h
|
| @@ -5,11 +5,15 @@
|
| #ifndef CC_TILES_TILE_MANAGER_H_
|
| #define CC_TILES_TILE_MANAGER_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <set>
|
| #include <utility>
|
| #include <vector>
|
|
|
| #include "base/containers/hash_tables.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/values.h"
|
| #include "cc/base/unique_notifier.h"
|
| @@ -228,10 +232,10 @@ class CC_EXPORT TileManager {
|
| MemoryUsage operator-(const MemoryUsage& other);
|
|
|
| bool Exceeds(const MemoryUsage& limit) const;
|
| - int64 memory_bytes() const { return memory_bytes_; }
|
| + int64_t memory_bytes() const { return memory_bytes_; }
|
|
|
| private:
|
| - int64 memory_bytes_;
|
| + int64_t memory_bytes_;
|
| int resource_count_;
|
| };
|
|
|
|
|