Merge 35371 - Fix up rowbytes vs. width desynchronization, and fix failure to...

chrome/common/common_param_traits.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/common_param_traits.h"
 
 #include "base/gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #ifndef EXCLUDE_SKIA_DEPENDENCIES
 #include "third_party/skia/include/core/SkBitmap.h"
 #endif
 #include "webkit/glue/dom_operations.h"
 
 namespace IPC {
 
 #ifndef EXCLUDE_SKIA_DEPENDENCIES
 
 namespace {
 
 struct SkBitmap_Data {
   // The configuration for the bitmap (bits per pixel, etc).
   SkBitmap::Config fConfig;
 
   // The width of the bitmap in pixels.
   uint32 fWidth;
 
   // The height of the bitmap in pixels.
   uint32 fHeight;
 
-  // The number of bytes between subsequent rows of the bitmap.
-  uint32 fRowBytes;
-
   void InitSkBitmapDataForTransfer(const SkBitmap& bitmap) {
     fConfig = bitmap.config();
     fWidth = bitmap.width();
     fHeight = bitmap.height();
-    fRowBytes = bitmap.rowBytes();
   }
 
   // Returns whether |bitmap| successfully initialized.
   bool InitSkBitmapFromData(SkBitmap* bitmap, const char* pixels,
                             size_t total_pixels) const {
     if (total_pixels) {
-      bitmap->setConfig(fConfig, fWidth, fHeight, fRowBytes);
+      bitmap->setConfig(fConfig, fWidth, fHeight, 0);
       if (!bitmap->allocPixels())
         return false;
-      if (total_pixels > bitmap->getSize())
+      if (total_pixels != bitmap->getSize())
         return false;
       memcpy(bitmap->getPixels(), pixels, total_pixels);
     }
     return true;
   }
 };
 
 }  // namespace
 
 
@@ skipping 140 matching lines @@
 bool ParamTraits<webkit_glue::WebApplicationInfo>::Read(
     const Message* m, void** iter, webkit_glue::WebApplicationInfo* r) {
   size_t icon_count;
   bool result =
     ReadParam(m, iter, &r->title) &&
     ReadParam(m, iter, &r->description) &&
     ReadParam(m, iter, &r->app_url) &&
     ReadParam(m, iter, &icon_count);
   if (!result)
     return false;
-  for (size_t i = 0; i < icon_count && result; ++i) {
+  for (size_t i = 0; i < icon_count; ++i) {
     param_type::IconInfo icon_info;
     result =
         ReadParam(m, iter, &icon_info.url) &&
         ReadParam(m, iter, &icon_info.width) &&
         ReadParam(m, iter, &icon_info.height);
+    if (!result)
+      return false;
     r->icons.push_back(icon_info);
   }
-  return result;
+  return true;
 }
 
 void ParamTraits<webkit_glue::WebApplicationInfo>::Log(
     const webkit_glue::WebApplicationInfo& p, std::wstring* l) {
   l->append(L"<WebApplicationInfo>");
 }
 
 }  // namespace IPC