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

Review URL: http://codereview.chromium.org/14110

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7182 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 15 insertions, 15 deletions

diff --git a/webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp b/webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp
index 0246501..d7c0daa 100644
--- a/webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp
+++ b/webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp
@@ -80,7 +80,7 @@ void ScrollbarThemeChromium::paintTrackPiece(GraphicsContext* gc, Scrollbar* scr
 {
     bool horz = scrollbar->orientation() == HorizontalScrollbar;
 
-    gfx::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
+    skia::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
     HDC hdc = canvas->beginPlatformPaint();
 
     RECT paintRect = toRECT(rect);
@@ -111,7 +111,7 @@ void ScrollbarThemeChromium::paintButton(GraphicsContext* gc, Scrollbar* scrollb
 {
     bool horz = scrollbar->orientation() == HorizontalScrollbar;
 
-    gfx::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
+    skia::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
     HDC hdc = canvas->beginPlatformPaint();
 
     RECT paintRect = toRECT(rect);
@@ -137,7 +137,7 @@ void ScrollbarThemeChromium::paintThumb(GraphicsContext* gc, Scrollbar* scrollba
 {
     bool horz = scrollbar->orientation() == HorizontalScrollbar;
 
-    gfx::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
+    skia::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
     HDC hdc = canvas->beginPlatformPaint();
 
     RECT paintRect = toRECT(rect);
diff --git a/webkit/port/platform/graphics/chromium/ImageBufferData.h b/webkit/port/platform/graphics/chromium/ImageBufferData.h
index 9b46294..f8d3fd3 100644
--- a/webkit/port/platform/graphics/chromium/ImageBufferData.h
+++ b/webkit/port/platform/graphics/chromium/ImageBufferData.h
@@ -43,7 +43,7 @@ class ImageBufferData {
 public:
     ImageBufferData(const IntSize&);
 
-    gfx::PlatformCanvas m_canvas;
+    skia::PlatformCanvas m_canvas;
 
     // Must be second since this will refer to m_canvas.
     PlatformContextSkia m_platformContext;
diff --git a/webkit/port/platform/graphics/skia/ImageSkia.cpp b/webkit/port/platform/graphics/skia/ImageSkia.cpp
index 6314699..972ca0d 100644
--- a/webkit/port/platform/graphics/skia/ImageSkia.cpp
+++ b/webkit/port/platform/graphics/skia/ImageSkia.cpp
@@ -245,7 +245,7 @@ void paintSkBitmap(PlatformContextSkia* platformContext,
     SkPaint paint;
     paint.setPorterDuffXfermode(compOp);
 
-    gfx::PlatformCanvas* canvas = platformContext->canvas();
+    skia::PlatformCanvas* canvas = platformContext->canvas();
 
     ResamplingMode resampling = platformContext->IsPrinting() ? RESAMPLE_NONE :
         computeResamplingMode(bitmap, srcRect.width(), srcRect.height(),
diff --git a/webkit/port/platform/graphics/skia/PlatformContextSkia.cpp b/webkit/port/platform/graphics/skia/PlatformContextSkia.cpp
index e691b5b..6cc1c0f 100644
--- a/webkit/port/platform/graphics/skia/PlatformContextSkia.cpp
+++ b/webkit/port/platform/graphics/skia/PlatformContextSkia.cpp
@@ -142,7 +142,7 @@ SkColor PlatformContextSkia::State::applyAlpha(SkColor c) const
 // PlatformContextSkia ---------------------------------------------------------
 
 // Danger: canvas can be NULL.
-PlatformContextSkia::PlatformContextSkia(gfx::PlatformCanvas* canvas)
+PlatformContextSkia::PlatformContextSkia(skia::PlatformCanvas* canvas)
     : m_canvas(canvas)
     , m_stateStack(sizeof(State))
 {
@@ -163,7 +163,7 @@ PlatformContextSkia::~PlatformContextSkia()
 #endif
 }
 
-void PlatformContextSkia::setCanvas(gfx::PlatformCanvas* canvas)
+void PlatformContextSkia::setCanvas(skia::PlatformCanvas* canvas)
 {
     m_canvas = canvas;
 }
diff --git a/webkit/port/platform/graphics/skia/PlatformContextSkia.h b/webkit/port/platform/graphics/skia/PlatformContextSkia.h
index 2e6e4b6..b8dc43f 100644
--- a/webkit/port/platform/graphics/skia/PlatformContextSkia.h
+++ b/webkit/port/platform/graphics/skia/PlatformContextSkia.h
@@ -63,12 +63,12 @@ class PlatformContextSkia {
 public:
     // For printing, there shouldn't be any canvas. canvas can be NULL. If you
     // supply a NULL canvas, you can also call setCanvas later.
-    PlatformContextSkia(gfx::PlatformCanvas* canvas);
+    PlatformContextSkia(skia::PlatformCanvas* canvas);
     ~PlatformContextSkia();
 
     // Sets the canvas associated with this context. Use when supplying NULL
     // to the constructor.
-    void setCanvas(gfx::PlatformCanvas* canvas);
+    void setCanvas(skia::PlatformCanvas* canvas);
 
     void save();
     void restore();
@@ -117,7 +117,7 @@ public:
 
     SkColor fillColor() const;
 
-    gfx::PlatformCanvas* canvas() { return m_canvas; }
+    skia::PlatformCanvas* canvas() { return m_canvas; }
 
     // TODO(brettw) why is this in this class?
     void drawRect(SkRect rect);
@@ -132,7 +132,7 @@ public:
     // Warning: This function is deprecated so the users are reminded that they
     // should use this layer of indirection instead of using the canvas
     // directly. This is to help with the eventual serialization.
-    gfx::PlatformCanvas* canvas() const;
+    skia::PlatformCanvas* canvas() const;
 
     // Returns if the context is a printing context instead of a display
     // context. Bitmap shouldn't be resampled when printing to keep the best
@@ -148,7 +148,7 @@ private:
     struct State;
 
     // NULL indicates painting is disabled. Never delete this object.
-    gfx::PlatformCanvas* m_canvas;
+    skia::PlatformCanvas* m_canvas;
 
     // States stack. Enables local drawing state change with save()/restore()
     // calls.
diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index 10915a9..1916f99 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -366,7 +366,7 @@ bool RenderThemeWin::paintButton(RenderObject* o,
     const ThemeData& themeData = getThemeData(o);
 
     WebCore::ThemeHelperWin helper(i.context, r);
-    gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
+    skia::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
 
     HDC hdc = canvas->beginPlatformPaint();
     int state = themeData.m_state;
@@ -439,7 +439,7 @@ bool RenderThemeWin::paintMenuList(RenderObject* o, const RenderObject::PaintInf
 
     // Get the correct theme data for a textfield and paint the menu.
     WebCore::ThemeHelperWin helper(i.context, rect);
-    gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
+    skia::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
     HDC hdc = canvas->beginPlatformPaint();
     RECT renderRect = helper.rect();
     gfx::NativeTheme::instance()->PaintMenuList(hdc,
@@ -580,7 +580,7 @@ bool RenderThemeWin::paintTextFieldInternal(RenderObject* o,
     const ThemeData& themeData = getThemeData(o);
 
     WebCore::ThemeHelperWin helper(i.context, r);
-    gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
+    skia::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
 
     HDC hdc = canvas->beginPlatformPaint();
     COLORREF clr = skia::SkColorToCOLORREF(o->style()->backgroundColor().rgb());