8 files changed, 20 insertions, 20 deletions
diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h
index 996d0db..d417563b 100644
--- a/webkit/glue/webframe.h
+++ b/webkit/glue/webframe.h
@@ -48,7 +48,7 @@ class WebTextInput;
 struct NPObject;
 
 namespace gfx {
-class BitmapPlatformDevice;
+class BitmapPlatformDeviceWin;
 class Size;
 class Rect;
 }
@@ -306,7 +306,7 @@ class WebFrame : public base::RefCounted<WebFrame> {
   // just draws the contents at a different place, but it does mean the
   // scrollbars in the resulting image will appear to be wrong (they'll be
   // painted as if the content was scrolled).
-  virtual gfx::BitmapPlatformDevice CaptureImage(bool scroll_to_zero) = 0;
+  virtual gfx::BitmapPlatformDeviceWin CaptureImage(bool scroll_to_zero) = 0;
 
   // This function sets a flag within WebKit to instruct it to render the page
   // as View-Source (showing the HTML source for the page).
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 64b79de..c8627d1 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -118,9 +118,9 @@
 #pragma warning(pop)
 
 #undef LOG
-#include "base/gfx/bitmap_platform_device.h"
+#include "base/gfx/bitmap_platform_device_win.h"
 #include "base/gfx/rect.h"
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
@@ -1358,7 +1358,7 @@ void WebFrameImpl::Layout() {
     FromFrame(child)->Layout();
 }
 
-void WebFrameImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
+void WebFrameImpl::Paint(gfx::PlatformCanvasWin* canvas, const gfx::Rect& rect) {
   static StatsRate rendering(L"WebFramePaintTime");
   StatsScope<StatsRate> rendering_scope(rendering);
 
@@ -1377,19 +1377,19 @@ void WebFrameImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
   }
 }
 
-gfx::BitmapPlatformDevice WebFrameImpl::CaptureImage(bool scroll_to_zero) {
+gfx::BitmapPlatformDeviceWin WebFrameImpl::CaptureImage(bool scroll_to_zero) {
   // Must layout before painting.
   Layout();
 
-  gfx::PlatformCanvas canvas(frameview()->width(), frameview()->height(), true);
+  gfx::PlatformCanvasWin canvas(frameview()->width(), frameview()->height(), true);
   PlatformContextSkia context(&canvas);
 
   GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context));
   frameview()->paint(&gc, IntRect(0, 0, frameview()->width(),
                                   frameview()->height()));
 
-  gfx::BitmapPlatformDevice& device =
-      static_cast<gfx::BitmapPlatformDevice&>(canvas.getTopPlatformDevice());
+  gfx::BitmapPlatformDeviceWin& device =
+      static_cast<gfx::BitmapPlatformDeviceWin&>(canvas.getTopPlatformDevice());
   device.fixupAlphaBeforeCompositing();
   return device;
 }
diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index 2b974b7..c466b16 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -63,8 +63,8 @@ struct WindowFeatures;
 }
 
 namespace gfx {
-class PlatformCanvas;
-class BitmapPlatformDevice;
+class PlatformCanvasWin;
+class BitmapPlatformDeviceWin;
 }
 
 // Implementation of WebFrame, note that this is a reference counted object.
@@ -108,7 +108,7 @@ class WebFrameImpl : public WebFrame {
   virtual WebFrame* GetParent() const;
   virtual WebFrame* GetChildFrame(const std::wstring& xpath) const;
   virtual WebView* GetView() const;
-  virtual gfx::BitmapPlatformDevice CaptureImage(bool scroll_to_zero);
+  virtual gfx::BitmapPlatformDeviceWin CaptureImage(bool scroll_to_zero);
 
   // This method calls createRuntimeObject (in KJS::Bindings::Instance), which
   // increments the refcount of the NPObject passed in.
@@ -182,7 +182,7 @@ class WebFrameImpl : public WebFrame {
 
   // WebFrameImpl
   void Layout();
-  void Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect);
+  void Paint(gfx::PlatformCanvasWin* canvas, const gfx::Rect& rect);
 
   bool IsLoading();
 
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 69b6cd2..3882c4a 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -655,7 +655,7 @@ void WebViewImpl::Layout() {
   }
 }
 
-void WebViewImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
+void WebViewImpl::Paint(gfx::PlatformCanvasWin* canvas, const gfx::Rect& rect) {
   if (main_frame_)
     main_frame_->Paint(canvas, rect);
 }
diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h
index e22c49f..57b18b6 100644
--- a/webkit/glue/webview_impl.h
+++ b/webkit/glue/webview_impl.h
@@ -83,7 +83,7 @@ class WebViewImpl : public WebView,
   virtual void Resize(const gfx::Size& new_size);
   virtual gfx::Size GetSize() { return size(); }
   virtual void Layout();
-  virtual void Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect);
+  virtual void Paint(gfx::PlatformCanvasWin* canvas, const gfx::Rect& rect);
   virtual bool HandleInputEvent(const WebInputEvent* input_event);
   virtual void MouseCaptureLost();
   virtual void SetFocus(bool enable);
diff --git a/webkit/glue/webwidget.h b/webkit/glue/webwidget.h
index 1f5f74c..a22cc9d 100644
--- a/webkit/glue/webwidget.h
+++ b/webkit/glue/webwidget.h
@@ -33,7 +33,7 @@
 #include "base/ref_counted.h"
 
 namespace gfx {
-class PlatformCanvas;
+class PlatformCanvasWin;
 class Rect;
 class Size;
 }
@@ -70,7 +70,7 @@ class WebWidget : public base::RefCounted<WebWidget> {
   // multiple times once Layout has been called, assuming no other changes are
   // made to the WebWidget (e.g., once events are processed, it should be assumed
   // that another call to Layout is warranted before painting again).
-  virtual void Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) = 0;
+  virtual void Paint(gfx::PlatformCanvasWin* canvas, const gfx::Rect& rect) = 0;
 
   // Called to inform the WebWidget of an input event.
   // Returns true if the event has been processed, false otherwise.
diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc
index 70dc0a1..4f5ad51 100644
--- a/webkit/glue/webwidget_impl.cc
+++ b/webkit/glue/webwidget_impl.cc
@@ -41,7 +41,7 @@
 #pragma warning(pop)
 
 #undef LOG
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "webkit/glue/event_conversion.h"
@@ -144,7 +144,7 @@ void WebWidgetImpl::Resize(const gfx::Size& new_size) {
 void WebWidgetImpl::Layout() {
 }
 
-void WebWidgetImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
+void WebWidgetImpl::Paint(gfx::PlatformCanvasWin* canvas, const gfx::Rect& rect) {
   if (!widget_)
     return;
 
diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index e885c1d..79d7323 100644
--- a/webkit/glue/webwidget_impl.h
+++ b/webkit/glue/webwidget_impl.h
@@ -61,7 +61,7 @@ class WebWidgetImpl : public WebWidget, public WebCore::WidgetClientWin {
   virtual void Resize(const gfx::Size& new_size);
   virtual gfx::Size GetSize() { return size(); }
   virtual void Layout();
-  virtual void Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect);
+  virtual void Paint(gfx::PlatformCanvasWin* canvas, const gfx::Rect& rect);
   virtual bool HandleInputEvent(const WebInputEvent* input_event);
   virtual void MouseCaptureLost();
   virtual void SetFocus(bool enable);