Consolidate Windows bitmap and DC code

printing/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 "printing/emf_win.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 88 matching lines @@
   explicit RasterBitmap(const gfx::Size& raster_size)
       : saved_object_(NULL) {
     context_.Set(::CreateCompatibleDC(NULL));
     if (!context_.IsValid()) {
       NOTREACHED() << "Bitmap DC creation failed";
       return;
     }
     ::SetGraphicsMode(context_.Get(), GM_ADVANCED);
     void* bits = NULL;
     gfx::Rect bitmap_rect(raster_size);
-    gfx::CreateBitmapHeader(raster_size.width(), raster_size.height(),
+    skia::CreateBitmapHeader(raster_size.width(), raster_size.height(),
                             &header_.bmiHeader);
     bitmap_.reset(CreateDIBSection(context_.Get(), &header_, DIB_RGB_COLORS,
                                    &bits, NULL, 0));
     if (!bitmap_.is_valid())
       NOTREACHED() << "Raster bitmap creation for printing failed";
 
     saved_object_ = ::SelectObject(context_.Get(), bitmap_.get());
     RECT rect = bitmap_rect.ToRECT();
     ::FillRect(context_.Get(), &rect,
                static_cast<HBRUSH>(::GetStockObject(WHITE_BRUSH)));
@@ skipping 261 matching lines @@
         if (bitmap.get()) {
           SkAutoLockPixels lock(*bitmap.get());
           DCHECK_EQ(bitmap->colorType(), kN32_SkColorType);
           const uint32_t* pixels =
               static_cast<const uint32_t*>(bitmap->getPixels());
           if (pixels == NULL) {
             NOTREACHED();
             return false;
           }
           BITMAPINFOHEADER bmi = {0};
-          gfx::CreateBitmapHeader(bitmap->width(), bitmap->height(), &bmi);
+          skia::CreateBitmapHeader(bitmap->width(), bitmap->height(), &bmi);
           res = (0 != StretchDIBits(hdc, sdib_record->xDest, sdib_record->yDest,
                                     sdib_record->cxDest,
                                     sdib_record->cyDest, sdib_record->xSrc,
                                     sdib_record->ySrc,
                                     sdib_record->cxSrc, sdib_record->cySrc,
                                     pixels,
                                     reinterpret_cast<const BITMAPINFO *>(&bmi),
                                     sdib_record->iUsageSrc,
                                     sdib_record->dwRop));
         }
@@ skipping 198 matching lines @@
   RECT rect = page_bounds.ToRECT();
   ::EnumEnhMetaFile(hdc, emf(), &RasterizeAlphaBlendProc, &bitmap_dc, &rect);
 
   result->FinishDocument();
 
   return result;
 }
 
 
 }  // namespace printing