diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-24 00:46:21 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-24 00:46:21 +0000 |
| commit | b3caa91a49ade3ae3f63159f7bb2189b33c14805 (patch) | |
| tree | 5df409d7e48b00eb1fa8985c5e58bd5605de912b /chrome/common/ipc_message_utils.cc | |
| parent | 025b3ef66aa030bb8a1e5f78a7d1e92696219649 (diff) | |
| download | chromium_src-b3caa91a49ade3ae3f63159f7bb2189b33c14805.zip chromium_src-b3caa91a49ade3ae3f63159f7bb2189b33c14805.tar.gz chromium_src-b3caa91a49ade3ae3f63159f7bb2189b33c14805.tar.bz2 | |
Revert 14398.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/ipc_message_utils.cc')
| -rw-r--r-- | chrome/common/ipc_message_utils.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/common/ipc_message_utils.cc b/chrome/common/ipc_message_utils.cc index 8ce3f4f..36e8052 100644 --- a/chrome/common/ipc_message_utils.cc +++ b/chrome/common/ipc_message_utils.cc @@ -33,18 +33,13 @@ struct SkBitmap_Data { fRowBytes = bitmap.rowBytes(); } - // Returns whether |bitmap| successfully initialized. - bool InitSkBitmapFromData(SkBitmap* bitmap, const char* pixels, + void InitSkBitmapFromData(SkBitmap* bitmap, const char* pixels, size_t total_pixels) const { if (total_pixels) { bitmap->setConfig(fConfig, fWidth, fHeight, fRowBytes); - if (!bitmap->allocPixels()) - return false; - if (total_pixels > bitmap->getSize()) - return false; + bitmap->allocPixels(); memcpy(bitmap->getPixels(), pixels, total_pixels); } - return true; } }; @@ -83,7 +78,8 @@ bool ParamTraits<SkBitmap>::Read(const Message* m, void** iter, SkBitmap* r) { } const SkBitmap_Data* bmp_data = reinterpret_cast<const SkBitmap_Data*>(fixed_data); - return bmp_data->InitSkBitmapFromData(r, variable_data, variable_data_size); + bmp_data->InitSkBitmapFromData(r, variable_data, variable_data_size); + return true; } void ParamTraits<SkBitmap>::Log(const SkBitmap& p, std::wstring* l) { |