Mojo C++ bindings: switch the remaining callsites of the old serialization interface.

chrome/utility/image_decoder_impl.cc

 // Copyright 2016 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/utility/image_decoder_impl.h"
 
 #include <string.h>
 
 #include <utility>
 
@@ skipping 57 matching lines @@
       }
     }
   }
 #endif  // defined(OS_CHROMEOS)
   if (codec == mojom::ImageCodec::DEFAULT) {
     decoded_image = content::DecodeImage(encoded_data.storage().data(),
                                          gfx::Size(), encoded_data.size());
   }
 
   if (!decoded_image.isNull()) {
-    skia::mojom::BitmapPtr dummy_image = skia::mojom::Bitmap::New();
-    int64_t struct_size =
-        skia::mojom::GetSerializedSize_(dummy_image, nullptr) + kPadding;
+    // When serialized, the space taken up by a skia::mojom::Bitmap excluding
+    // the pixel data payload should be:
+    //   sizeof(skia::mojom::Bitmap::Data_) + pixel data array header (8 bytes)
+    // Use a bigger number in case we need padding at the end.
+    int64_t struct_size = sizeof(skia::mojom::Bitmap::Data_) + kPadding;
     int64_t image_size = decoded_image.computeSize64();
     int halves = 0;
     while (struct_size + (image_size >> 2 * halves) > max_message_size_)
       halves++;
     if (halves) {
       if (shrink_to_fit) {
         // If decoded image is too large for IPC message, shrink it by halves.
         // This prevents quality loss, and should never overshrink on displays
         // smaller than 3600x2400.
         // TODO (Issue 416916): Instead of shrinking, return via shared memory
         decoded_image = skia::ImageOperations::Resize(
             decoded_image, skia::ImageOperations::RESIZE_LANCZOS3,
             decoded_image.width() >> halves, decoded_image.height() >> halves);
       } else {
         decoded_image.reset();
       }
     }
   }
 
   if (decoded_image.isNull())
     callback.Run(nullptr);
   else
     callback.Run(skia::mojom::Bitmap::From(decoded_image));
 }