Index: cc/tiles/tile_manager.h |
diff --git a/cc/tiles/tile_manager.h b/cc/tiles/tile_manager.h |
index 8611b3a361584402d4c2d3d2917e9ab18edcf078..f8994c2f1e672d2e8efd5e5bfc8bb6310384c77f 100644 |
--- a/cc/tiles/tile_manager.h |
+++ b/cc/tiles/tile_manager.h |
@@ -213,7 +213,7 @@ class CC_EXPORT TileManager : public TileTaskRunnerClient { |
class MemoryUsage { |
public: |
MemoryUsage(); |
- MemoryUsage(int64 memory_bytes, int resource_count); |
+ MemoryUsage(size_t memory_bytes, size_t resource_count); |
static MemoryUsage FromConfig(const gfx::Size& size, ResourceFormat format); |
static MemoryUsage FromTile(const Tile* tile); |
@@ -223,7 +223,11 @@ class CC_EXPORT TileManager : public TileTaskRunnerClient { |
MemoryUsage operator-(const MemoryUsage& other); |
bool Exceeds(const MemoryUsage& limit) const; |
- int64 memory_bytes() const { return memory_bytes_; } |
+ size_t memory_bytes() const { |
+ // This is used for HUD layers / logging, so we can just static_cast here. |
+ DCHECK_GE(memory_bytes_, 0); |
+ return static_cast<size_t>(memory_bytes_); |
+ } |
private: |
int64 memory_bytes_; |
danakj
2015/06/09 17:39:49
why not size_ts here?
|