Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Unified Diff: cc/resources/resource_provider.cc

Issue 221523003: cc: Remove all usage of GetArea() from production code in cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: getarea: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/software_frame_data.cc ('k') | cc/resources/shared_bitmap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 1e7c9d783de800b4a776122ed7d97e1f2fe116ab..39d663ae56cbc3456c46372580a5a07b49bbe90f 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -702,10 +702,12 @@ ResourceProvider::ResourceId ResourceProvider::CreateBitmap(
bitmap = shared_bitmap_manager_->AllocateSharedBitmap(size);
uint8_t* pixels;
- if (bitmap)
+ if (bitmap) {
pixels = bitmap->pixels();
- else
- pixels = new uint8_t[4 * size.GetArea()];
+ } else {
+ size_t bytes = SharedBitmap::CheckedSizeInBytes(size);
+ pixels = new uint8_t[bytes];
+ }
DCHECK(pixels);
ResourceId id = next_id_++;
@@ -1813,8 +1815,8 @@ void ResourceProvider::AcquirePixelBuffer(Resource* resource) {
DCHECK_EQ(Bitmap, resource->type);
if (resource->pixel_buffer)
return;
-
- resource->pixel_buffer = new uint8_t[4 * resource->size.GetArea()];
+ size_t bytes = SharedBitmap::CheckedSizeInBytes(resource->size);
+ resource->pixel_buffer = new uint8_t[bytes];
}
}
@@ -1989,8 +1991,8 @@ void ResourceProvider::BeginSetPixels(ResourceId id) {
DCHECK(resource->pixel_buffer);
DCHECK_EQ(RGBA_8888, resource->format);
- memcpy(
- resource->pixels, resource->pixel_buffer, 4 * resource->size.GetArea());
+ size_t bytes = SharedBitmap::CheckedSizeInBytes(resource->size);
+ memcpy(resource->pixels, resource->pixel_buffer, bytes);
delete[] resource->pixel_buffer;
resource->pixel_buffer = NULL;
}
« no previous file with comments | « cc/output/software_frame_data.cc ('k') | cc/resources/shared_bitmap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698