diff options
Diffstat (limited to 'chromium/ui/gfx/ipc/skia/gfx_skia_param_traits.cc')
| -rw-r--r-- | chromium/ui/gfx/ipc/skia/gfx_skia_param_traits.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chromium/ui/gfx/ipc/skia/gfx_skia_param_traits.cc b/chromium/ui/gfx/ipc/skia/gfx_skia_param_traits.cc index 21a3b7f8ad8..844e357f723 100644 --- a/chromium/ui/gfx/ipc/skia/gfx_skia_param_traits.cc +++ b/chromium/ui/gfx/ipc/skia/gfx_skia_param_traits.cc @@ -65,8 +65,7 @@ void ParamTraits<SkImageInfo>::Log(const SkImageInfo& p, std::string* l) { void ParamTraits<SkBitmap>::Write(base::Pickle* m, const SkBitmap& p) { WriteParam(m, p.info()); size_t pixel_size = p.computeByteSize(); - m->WriteData(reinterpret_cast<const char*>(p.getPixels()), - static_cast<int>(pixel_size)); + m->WriteData(reinterpret_cast<const char*>(p.getPixels()), pixel_size); } bool ParamTraits<SkBitmap>::Read(const base::Pickle* m, @@ -77,15 +76,14 @@ bool ParamTraits<SkBitmap>::Read(const base::Pickle* m, return false; const char* bitmap_data; - int bitmap_data_size = 0; + size_t bitmap_data_size = 0; if (!iter->ReadData(&bitmap_data, &bitmap_data_size)) return false; - // ReadData() only returns true if bitmap_data_size >= 0. if (!r->tryAllocPixels(image_info)) return false; - if (static_cast<size_t>(bitmap_data_size) != r->computeByteSize()) + if (bitmap_data_size != r->computeByteSize()) return false; memcpy(r->getPixels(), bitmap_data, bitmap_data_size); return true; |