gfx: ipc: Remove deprecated calls from SkBitmap IPC traits

ui/gfx/ipc/gfx_param_traits.cc

 // Copyright (c) 2012 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 "ui/gfx/ipc/gfx_param_traits.h"
 
 #include <string>
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 
 namespace {
 
 struct SkBitmap_Data {
-  // The configuration for the bitmap (bits per pixel, etc).
-  SkBitmap::Config fConfig;
+  // The color type for the bitmap (bits per pixel, etc).
+  SkColorType fColorType;
+
+  // The alpha type for the bitmap (opaque, premul, unpremul).
+  SkAlphaType fAlphaType;
 
   // The width of the bitmap in pixels.
   uint32 fWidth;
 
   // The height of the bitmap in pixels.
   uint32 fHeight;
 
   void InitSkBitmapDataForTransfer(const SkBitmap& bitmap) {
-    fConfig = bitmap.config();
-    fWidth = bitmap.width();
-    fHeight = bitmap.height();
+    const SkImageInfo& info = bitmap.info();
+    fColorType = info.fColorType;
+    fAlphaType = info.fAlphaType;
+    fWidth = info.fWidth;
+    fHeight = info.fHeight;
   }
 
   // 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, 0);
-      if (!bitmap->allocPixels())
-        return false;
-      if (total_pixels != bitmap->getSize())
-        return false;
-      memcpy(bitmap->getPixels(), pixels, total_pixels);
-    }
+  bool InitSkBitmapFromData(SkBitmap* bitmap,
+                            const char* pixels,
+                            size_t pixels_size) const {
+    if (!bitmap->allocPixels(
+            SkImageInfo::Make(fWidth, fHeight, fColorType, fAlphaType)))
+      return false;
+    if (pixels_size != bitmap->getSize())
+      return false;
+    memcpy(bitmap->getPixels(), pixels, pixels_size);
     return true;
   }
 };
 
 }  // namespace
 
 namespace IPC {
 
 void ParamTraits<gfx::Point>::Write(Message* m, const gfx::Point& p) {
   m->WriteInt(p.x());
@@ skipping 203 matching lines @@
   const SkBitmap_Data* bmp_data =
       reinterpret_cast<const SkBitmap_Data*>(fixed_data);
   return bmp_data->InitSkBitmapFromData(r, variable_data, variable_data_size);
 }
 
 void ParamTraits<SkBitmap>::Log(const SkBitmap& p, std::string* l) {
   l->append("<SkBitmap>");
 }
 
 }  // namespace IPC