Consolidate Windows bitmap and DC code

ui/gfx/icon_util.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/icon_util.h"
 
 #include <memory>
 
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/resource_util.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_hdc.h"
 #include "skia/ext/image_operations.h"
+#include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/gdi_util.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_family.h"
 
 namespace {
 
 // Used for indicating that the .ico contains an icon (rather than a cursor)
 // image. This value is set in the |idType| field of the ICONDIR structure.
 const int kResourceTypeIcon = 1;
 
@@ skipping 282 matching lines @@
 
   gfx::Size icon_size(bitmap_info.bmWidth, bitmap_info.bmHeight);
   return new SkBitmap(CreateSkBitmapFromHICONHelper(icon, icon_size));
 }
 
 base::win::ScopedHICON IconUtil::CreateCursorFromDIB(const gfx::Size& icon_size,
                                                      const gfx::Point& hotspot,
                                                      const void* dib_bits,
                                                      size_t dib_size) {
   BITMAPINFO icon_bitmap_info = {};
-  gfx::CreateBitmapHeader(
+  skia::CreateBitmapHeader(
       icon_size.width(),
       icon_size.height(),
       reinterpret_cast<BITMAPINFOHEADER*>(&icon_bitmap_info));
 
   base::win::ScopedGetDC dc(NULL);
   base::win::ScopedCreateDC working_dc(CreateCompatibleDC(dc));
   base::win::ScopedGDIObject<HBITMAP> bitmap_handle(
       CreateDIBSection(dc,
                        &icon_bitmap_info,
                        DIB_RGB_COLORS,
@@ skipping 356 matching lines @@
   // Once we compute the size for a singe AND mask scan line, we multiply that
   // number by the image height in order to get the total number of bytes for
   // the AND mask. Thus, for a 15X15 image, we need 15 * 4 which is 60 bytes
   // for the monochrome bitmap representing the AND mask.
   size_t and_line_length = (bitmap.width() + 7) >> 3;
   and_line_length = (and_line_length + 3) & ~3;
   size_t and_mask_size = and_line_length * bitmap.height();
   size_t masks_size = *xor_mask_size + and_mask_size;
   *bytes_in_resource = masks_size + sizeof(BITMAPINFOHEADER);
 }