Update from https://crrev.com/306706

skia/ext/bitmap_platform_device_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 <windows.h>
 #include <psapi.h>
 
 #include "base/debug/gdi_debug_util_win.h"
 #include "base/logging.h"
 #include "skia/ext/bitmap_platform_device_win.h"
@@ skipping 102 matching lines @@
 }
 
 // We use this static factory function instead of the regular constructor so
 // that we can create the pixel data before calling the constructor. This is
 // required so that we can call the base class' constructor with the pixel
 // data.
 BitmapPlatformDevice* BitmapPlatformDevice::Create(
     int width,
     int height,
     bool is_opaque,
-    HANDLE shared_section) {
+    HANDLE shared_section,
+    bool do_clear) {
 
   void* data;
   HBITMAP hbitmap = CreateHBitmap(width, height, is_opaque, shared_section,
                                   &data);
   if (!hbitmap)
     return NULL;
 
   SkBitmap bitmap;
   if (!InstallHBitmapPixels(&bitmap, width, height, is_opaque, data, hbitmap))
     return NULL;
 
+  if (do_clear)
+    bitmap.eraseColor(0);
+
 #ifndef NDEBUG
   // If we were given data, then don't clobber it!
   if (!shared_section && is_opaque)
     // To aid in finding bugs, we set the background color to something
     // obviously wrong so it will be noticable when it is not cleared
     bitmap.eraseARGB(255, 0, 255, 128);  // bright bluish green
 #endif
 
   // The device object will take ownership of the HBITMAP. The initial refcount
   // of the data object will be 1, which is what the constructor expects.
   return new BitmapPlatformDevice(hbitmap, bitmap);
 }
 
 // static
 BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height,
                                                    bool is_opaque) {
-  return Create(width, height, is_opaque, NULL);
-}
-
-// static
-BitmapPlatformDevice* BitmapPlatformDevice::CreateAndClear(int width,
-                                                           int height,
-                                                           bool is_opaque) {
-  BitmapPlatformDevice* device = BitmapPlatformDevice::Create(width, height,
-                                                              is_opaque);
-  if (device && !is_opaque)
-    device->clear(0);
-  return device;
+  const HANDLE shared_section = NULL;
+  const bool do_clear = false;
+  return Create(width, height, is_opaque, shared_section, do_clear);
 }
 
 // The device will own the HBITMAP, which corresponds to also owning the pixel
 // data. Therefore, we do not transfer ownership to the SkBitmapDevice's bitmap.
 BitmapPlatformDevice::BitmapPlatformDevice(
     HBITMAP hbitmap,
     const SkBitmap& bitmap)
     : SkBitmapDevice(bitmap),
       hbitmap_(hbitmap),
       old_hbitmap_(NULL),
@@ skipping 91 matching lines @@
 
 const SkBitmap& BitmapPlatformDevice::onAccessBitmap() {
   // FIXME(brettw) OPTIMIZATION: We should only flush if we know a GDI
   // operation has occurred on our DC.
   if (IsBitmapDCCreated())
     GdiFlush();
   return SkBitmapDevice::onAccessBitmap();
 }
 
 SkBaseDevice* BitmapPlatformDevice::onCreateCompatibleDevice(
-                                                    const CreateInfo& info) {
-  SkASSERT(info.fInfo.colorType() == kN32_SkColorType);
-  return BitmapPlatformDevice::CreateAndClear(info.fInfo.width(),
-                                              info.fInfo.height(),
-                                              info.fInfo.isOpaque());
+                                                    const CreateInfo& cinfo) {
+  const SkImageInfo& info = cinfo.fInfo;
+  const bool do_clear = !info.isOpaque();
+  SkASSERT(info.colorType() == kN32_SkColorType);
+  return Create(info.width(), info.height(), info.isOpaque(), NULL, do_clear);
 }
 
 // PlatformCanvas impl
 
 SkCanvas* CreatePlatformCanvas(int width,
                                int height,
                                bool is_opaque,
                                HANDLE shared_section,
                                OnFailureType failureType) {
   skia::RefPtr<SkBaseDevice> dev = skia::AdoptRef(
@@ skipping 26 matching lines @@
   platform_extra_ = reinterpret_cast<intptr_t>(stock_bitmap);
 
   if (!InstallHBitmapPixels(&bitmap_, width, height, is_opaque, data, hbitmap))
     return false;
   bitmap_.lockPixels();
 
   return true;
 }
 
 }  // namespace skia