stop calling deprecated setConfig

skia/ext/vector_platform_device_emf_win.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 "skia/ext/vector_platform_device_emf_win.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 63 matching lines @@
   bool succeeded = false;
   if (selected_bitmap != NULL) {
     BITMAP bitmap_data = {0};
     if (GetObject(selected_bitmap, sizeof(BITMAP), &bitmap_data) ==
         sizeof(BITMAP)) {
       // The context has a bitmap attached. Attach our SkBitmap to it.
       // Warning: If the bitmap gets unselected from the HDC,
       // VectorPlatformDeviceEmf has no way to detect this, so the HBITMAP
       // could be released while SkBitmap still has a reference to it. Be
       // cautious.
-      if (width == bitmap_data.bmWidth &&
-          height == bitmap_data.bmHeight) {
-        bitmap.setConfig(SkBitmap::kARGB_8888_Config,
-                         bitmap_data.bmWidth,
-                         bitmap_data.bmHeight,
-                         bitmap_data.bmWidthBytes);
-        bitmap.setPixels(bitmap_data.bmBits);
-        succeeded = true;
+      if (width == bitmap_data.bmWidth && height == bitmap_data.bmHeight) {
+        SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
+        succeeded = bitmap.installPixels(info, bitmap_data.bmBits,
+                                         bitmap_data.bmWidthBytes);
       }
     }
   }
 
   if (!succeeded)
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
+    bitmap.setInfo(SkImageInfo::MakeEmpty(width, height));

[f(malita), 2014/06/16 21:00:45]

This actually looks like it's fixing an existing issue, right?

[reed1, 2014/06/16 21:19:04]

Yes, I think so.

 
   return new VectorPlatformDeviceEmf(dc, bitmap);
 }
 
 VectorPlatformDeviceEmf::VectorPlatformDeviceEmf(HDC dc, const SkBitmap& bitmap)
     : SkBitmapDevice(bitmap),
       hdc_(dc),
       previous_brush_(NULL),
       previous_pen_(NULL) {
   transform_.reset();
@@ skipping 882 matching lines @@
                                 pixels,
                                 reinterpret_cast<const BITMAPINFO*>(&hdr),
                                 DIB_RGB_COLORS,
                                 SRCCOPY);
   }
   EndPlatformPaint();
   Cleanup();
 }
 
 }  // namespace skia