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

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 1395 matching lines @@
   FrameView* view = frame_->view();
   if (view)
     view->layout();
 
   // recursively layout child frames
   Frame* child = frame_->tree()->firstChild();
   for (; child; child = child->tree()->nextSibling())
     FromFrame(child)->Layout();
 }
 
-void WebFrameImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
+void WebFrameImpl::Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect) {
   static StatsRate rendering("WebFramePaintTime");
   StatsScope<StatsRate> rendering_scope(rendering);
 
   if (!rect.IsEmpty()) {
     IntRect dirty_rect(rect.x(), rect.y(), rect.width(), rect.height());
 #if defined(OS_MACOSX)
     CGContextRef context = canvas->getTopPlatformDevice().GetBitmapContext();
     GraphicsContext gc(context);
 #else
     PlatformContextSkia context(canvas);
 
     // PlatformGraphicsContext is actually a pointer to PlatformContextSkia
     GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context));
 #endif
     if (frame_->document() && frameview()) {
       frameview()->paint(&gc, dirty_rect);
     } else {
       gc.fillRect(dirty_rect, Color::white);
     }
   }
 }
 
-bool WebFrameImpl::CaptureImage(scoped_ptr<gfx::BitmapPlatformDevice>* image,
+bool WebFrameImpl::CaptureImage(scoped_ptr<skia::BitmapPlatformDevice>* image,
                                 bool scroll_to_zero) {
   if (!image) {
     NOTREACHED();
     return false;
   }
 
   // Must layout before painting.
   Layout();
 
-  gfx::PlatformCanvas canvas;
+  skia::PlatformCanvas canvas;
   if (!canvas.initialize(frameview()->width(), frameview()->height(), true))
     return false;
 
 #if defined(OS_WIN) || defined(OS_LINUX)
   PlatformContextSkia context(&canvas);
   GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context));
 #elif defined(OS_MACOSX)
   CGContextRef context = canvas.beginPlatformPaint();
   GraphicsContext gc(context);
 #endif
   frameview()->paint(&gc, IntRect(0, 0, frameview()->width(),
                                   frameview()->height()));
 #if defined(OS_MACOSX)
   canvas.endPlatformPaint();
 #endif
 
-  gfx::BitmapPlatformDevice& device =
-      static_cast<gfx::BitmapPlatformDevice&>(canvas.getTopPlatformDevice());
+  skia::BitmapPlatformDevice& device =
+      static_cast<skia::BitmapPlatformDevice&>(canvas.getTopPlatformDevice());
 
 #if defined(OS_WIN)
   device.fixupAlphaBeforeCompositing();
 #endif
 
-  image->reset(new gfx::BitmapPlatformDevice(device));
+  image->reset(new skia::BitmapPlatformDevice(device));
   return true;
 }
 
 bool WebFrameImpl::IsLoading() {
   // I'm assuming this does what we want.
   return frame_->loader()->isLoading();
 }
 
 void WebFrameImpl::Closing() {
   alt_error_page_fetcher_.reset();
@@ skipping 282 matching lines @@
 }
 
 void WebFrameImpl::GetPageRect(int page, gfx::Rect* page_size) const {
   if (page < 0 || page >= static_cast<int>(pages_.size())) {
     NOTREACHED();
     return;
   }
   *page_size = webkit_glue::FromIntRect(pages_[page]);
 }
 
-bool WebFrameImpl::SpoolPage(int page, gfx::PlatformCanvas* canvas) {
+bool WebFrameImpl::SpoolPage(int page, skia::PlatformCanvas* canvas) {
   // Ensure correct state.
   if (!printing_ ||
       page < 0 ||
       page >= static_cast<int>(pages_.size())) {
     NOTREACHED();
     return false;
   }
 
   if (!frame() || !frame()->document()) {
     NOTREACHED();
@@ skipping 42 matching lines @@
   return password_listeners_.get(input_element);
 }
 
 void WebFrameImpl::ClearPasswordListeners() {
   for (PasswordListenerMap::iterator iter = password_listeners_.begin();
        iter != password_listeners_.end(); ++iter) {
     delete iter->second;
   }
   password_listeners_.clear();
 }