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

webkit/glue/webframe_impl.h

 /*
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 92 matching lines @@
   virtual GURL GetURL() const;
   virtual GURL GetFavIconURL() const;
   virtual GURL GetOSDDURL() const;
   virtual WebDataSource* GetDataSource() const;
   virtual WebDataSource* GetProvisionalDataSource() const;
   virtual void StopLoading();
   virtual WebFrame* GetOpener() const;
   virtual WebFrame* GetParent() const;
   virtual WebFrame* GetChildFrame(const std::wstring& xpath) const;
   virtual WebView* GetView() const;
-  virtual bool CaptureImage(scoped_ptr<gfx::BitmapPlatformDevice>* image,
+  virtual bool CaptureImage(scoped_ptr<skia::BitmapPlatformDevice>* image,
                             bool scroll_to_zero);
 
   // This method calls createRuntimeObject (in KJS::Bindings::Instance), which
   // increments the refcount of the NPObject passed in.
   virtual void BindToWindowObject(const std::wstring& name, NPObject* object);
   virtual void CallJSGC();
 
   virtual void* GetFrameImplementation() { return frame(); }
 
   virtual void GetContentAsPlainText(int max_chars, std::wstring* text) const;
@@ skipping 37 matching lines @@
   virtual void ClosePage();
 
   virtual gfx::Size ScrollOffset() const;
 
   virtual bool SetPrintingMode(bool printing,
                                float page_width_min,
                                float page_width_max,
                                int* width);
   virtual int ComputePageRects(const gfx::Size& page_size_px);
   virtual void GetPageRect(int page, gfx::Rect* page_size) const;
-  virtual bool SpoolPage(int page, gfx::PlatformCanvas* canvas);
+  virtual bool SpoolPage(int page, skia::PlatformCanvas* canvas);
 
   // Reformats this frame for printing or for screen display, depending on
   // |printing| flag. Acts recursively on inner frames.
   // Note: It fails if the main frame failed to load. It will succeed even if a
   // child frame failed to load.
   void SetPrinting(bool printing, float page_width_min, float page_width_max);
 
   PassRefPtr<WebCore::Frame> CreateChildFrame(
       const WebCore::FrameLoadRequest&,
       WebCore::HTMLFrameOwnerElement* owner_element);
 
   // WebFrameImpl
   void Layout();
-  void Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect);
+  void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect);
 
   bool IsLoading();
 
   void CreateFrameView();
 
   // The plugin delegate is used to get notifications when downloads complete.
   // This is used by the NPAPI method getURLNotify.  plugin_delegate() may
   // return NULL.  TODO(darin): how come there is only one per frame?!?
   WebPluginDelegate* plugin_delegate() const {
     return plugin_delegate_;
@@ skipping 232 matching lines @@
   // The input fields that are interested in edit events and their associated
   // listeners.
   typedef HashMap<RefPtr<WebCore::HTMLInputElement>,
       webkit_glue::PasswordAutocompleteListener*> PasswordListenerMap;
   PasswordListenerMap password_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(WebFrameImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBFRAME_IMPL_H_