| Index: cc/resources/shared_bitmap.h
|
| diff --git a/cc/resources/shared_bitmap.h b/cc/resources/shared_bitmap.h
|
| index d62ffccaa82911796893590fe602d7c1e1941b7a..762547d5cbe2b66dc4dd5bf5f398840465fccaae 100644
|
| --- a/cc/resources/shared_bitmap.h
|
| +++ b/cc/resources/shared_bitmap.h
|
| @@ -21,7 +21,7 @@ class CC_EXPORT SharedBitmap {
|
| public:
|
| SharedBitmap(base::SharedMemory* memory,
|
| const SharedBitmapId& id,
|
| - const base::Callback<void(SharedBitmap*)>& free_callback);
|
| + const base::Callback<void(SharedBitmap* bitmap)>& free_callback);
|
|
|
| ~SharedBitmap();
|
|
|
| @@ -40,14 +40,22 @@ class CC_EXPORT SharedBitmap {
|
| SharedBitmapId id() { return id_; }
|
|
|
| // Returns true if the size is valid and false otherwise.
|
| - static bool GetSizeInBytes(const gfx::Size& size, size_t* size_in_bytes);
|
| + static bool SizeInBytes(const gfx::Size& size, size_t* size_in_bytes);
|
| + // Dies with a CRASH() if the size can not be represented as a positive number
|
| + // of bytes.
|
| + static size_t CheckedSizeInBytes(const gfx::Size& size);
|
| + // Returns the size in bytes but may overflow or return 0. Only do this for
|
| + // sizes that have already been checked.
|
| + static size_t UncheckedSizeInBytes(const gfx::Size& size);
|
| + // Returns true if the size is valid and false otherwise.
|
| + static bool VerifySizeInBytes(const gfx::Size& size);
|
|
|
| static SharedBitmapId GenerateId();
|
|
|
| private:
|
| base::SharedMemory* memory_;
|
| SharedBitmapId id_;
|
| - base::Callback<void(SharedBitmap*)> free_callback_;
|
| + base::Callback<void(SharedBitmap* bitmap)> free_callback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SharedBitmap);
|
| };
|
|
|