Move the "platform" wrappers in skia/ext to the skia namespace.

chrome/renderer/render_view.cc

 // Copyright (c) 2006-2008 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 493 matching lines @@
     return;
   }
 
   // Generate a memory-based EMF file. The EMF will use the current screen's
   // DPI.
   gfx::Emf emf;
 
   emf.CreateDc(NULL, NULL);
   HDC hdc = emf.hdc();
   DCHECK(hdc);
-  gfx::PlatformDeviceWin::InitializeDC(hdc);
+  skia::PlatformDeviceWin::InitializeDC(hdc);
 
   gfx::Rect rect;
   frame->GetPageRect(params.page_number, &rect);
   DCHECK(rect.height());
   DCHECK(rect.width());
   double shrink = static_cast<double>(printed_document_width_) /
                   params.params.printable_size.width();
   // This check would fire each time the page would get truncated on the
   // right. This is not worth a DCHECK() but should be looked into, for
   // example, wouldn't be worth trying in landscape?
   // DCHECK_LE(rect.width(), printed_document_width_);
 
   // Buffer one page at a time.
   int src_size_x = printed_document_width_;
   int src_size_y =
       static_cast<int>(ceil(params.params.printable_size.height() *
                             shrink));
 #if 0
   // TODO(maruel): This code is kept for testing until the 100% GDI drawing
   // code is stable. maruels use this code's output as a reference when the
   // GDI drawing code fails.
 
   // Mix of Skia and GDI based.
-  gfx::PlatformCanvasWin canvas(src_size_x, src_size_y, true);
+  skia::PlatformCanvasWin canvas(src_size_x, src_size_y, true);
   canvas.drawARGB(255, 255, 255, 255, SkPorterDuff::kSrc_Mode);
   PlatformContextSkia context(&canvas);
   if (!frame->SpoolPage(params.page_number, &context)) {
     NOTREACHED() << "Printing page " << params.page_number << " failed.";
     return;
   }
 
   // Create a BMP v4 header that we can serialize.
   BITMAPV4HEADER bitmap_header;
   gfx::CreateBitmapV4Header(src_size_x, src_size_y, &bitmap_header);
   const SkBitmap& src_bmp = canvas.getDevice()->accessBitmap(true);
   SkAutoLockPixels src_lock(src_bmp);
   int retval = StretchDIBits(hdc,
                              0,
                              0,
                              src_size_x, src_size_y,
                              0, 0,
                              src_size_x, src_size_y,
                              src_bmp.getPixels(),
                              reinterpret_cast<BITMAPINFO*>(&bitmap_header),
                              DIB_RGB_COLORS,
                              SRCCOPY);
   DCHECK(retval != GDI_ERROR);
 #else
   // 100% GDI based.
-  gfx::VectorCanvas canvas(hdc, src_size_x, src_size_y);
+  skia::VectorCanvas canvas(hdc, src_size_x, src_size_y);
   // Set the clipping region to be sure to not overflow.
   SkRect clip_rect;
   clip_rect.set(0, 0, SkIntToScalar(src_size_x), SkIntToScalar(src_size_y));
   canvas.clipRect(clip_rect);
   if (!frame->SpoolPage(params.page_number, &canvas)) {
     NOTREACHED() << "Printing page " << params.page_number << " failed.";
     return;
   }
 #endif
 
@@ skipping 173 matching lines @@
 
 bool RenderView::CaptureThumbnail(WebFrame* frame,
                                   int w,
                                   int h,
                                   SkBitmap* thumbnail,
                                   ThumbnailScore* score) {
 #ifdef TIME_BITMAP_RETRIEVAL
   double begin = time_util::GetHighResolutionTimeNow();
 #endif
 
-  scoped_ptr<gfx::BitmapPlatformDevice> device;
+  scoped_ptr<skia::BitmapPlatformDevice> device;
   if (!frame->CaptureImage(&device, true))
     return false;
 
   const SkBitmap& src_bmp = device->accessBitmap(false);
 
   SkRect dest_rect;
   dest_rect.set(0, 0, SkIntToScalar(w), SkIntToScalar(h));
   float dest_aspect = dest_rect.width() / dest_rect.height();
 
   // Get the src rect so that we can preserve the aspect ratio while filling
@@ skipping 1970 matching lines @@
           template_resource_id));
 
   if (template_html.empty()) {
     NOTREACHED() << "unable to load template. ID: " << template_resource_id;
     return "";
   }
   // "t" is the id of the templates root node.
   return jstemplate_builder::GetTemplateHtml(
       template_html, &error_strings, "t");
 }