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

27 files changed, 57 insertions, 57 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);
diff --git a/webkit/pending/CanvasRenderingContext2D.cpp b/webkit/pending/CanvasRenderingContext2D.cpp
index a68abe8..1d28a2f 100644
--- a/webkit/pending/CanvasRenderingContext2D.cpp
+++ b/webkit/pending/CanvasRenderingContext2D.cpp
@@ -58,7 +58,7 @@
 #include <cairo.h>
 #elif defined(ANDROID_CANVAS_IMPL)
 #include "PlatformContextSkia.h"
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #endif
 
 namespace WebCore {
diff --git a/webkit/port/platform/PlatformScrollBar.h b/webkit/port/platform/PlatformScrollBar.h
index 0a3426b..ee619e1 100644
--- a/webkit/port/platform/PlatformScrollBar.h
+++ b/webkit/port/platform/PlatformScrollBar.h
@@ -33,7 +33,7 @@
 #include "Timer.h"
 
 namespace gfx {
-class PlatformCanvas;
+class PlatformCanvasWin;
 }
 
 namespace WebCore {
diff --git a/webkit/port/platform/PlatformScrollBarWin.cpp b/webkit/port/platform/PlatformScrollBarWin.cpp
index 9845c05..c921e97 100644
--- a/webkit/port/platform/PlatformScrollBarWin.cpp
+++ b/webkit/port/platform/PlatformScrollBarWin.cpp
@@ -45,7 +45,7 @@
 
 #undef LOG
 #include "base/gfx/native_theme.h"
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "base/win_util.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webkit_glue.h"
@@ -189,7 +189,7 @@ void PlatformScrollbar::DrawTickmarks(GraphicsContext* context) const
     // will not be serialized, i.e. composition is done in the renderer and
     // never in the browser.
     // Prepare the bitmap for drawing the tickmarks on the scroll bar.
-    gfx::PlatformCanvas* canvas = PlatformContextToPlatformContextSkia(
+    gfx::PlatformCanvasWin* canvas = PlatformContextToPlatformContextSkia(
         context->platformContext())->canvas();
 
     // Load the image for the tickmark.
@@ -242,7 +242,7 @@ void PlatformScrollbar::paint(GraphicsContext* gc, const IntRect& damageRect)
     const PlatformContextSkia* const skia =
         PlatformContextToPlatformContextSkia(gc->platformContext());
     const gfx::NativeTheme* const nativeTheme = skia->nativeTheme();
-    gfx::PlatformCanvas* const canvas = skia->canvas();
+    gfx::PlatformCanvasWin* const canvas = skia->canvas();
     
     // Draw the up/left arrow of the scroll bar.
     nativeTheme->PaintScrollbarArrow(hdc, getThemeArrowState(Arrow1),
diff --git a/webkit/port/platform/ScrollViewWin.cpp b/webkit/port/platform/ScrollViewWin.cpp
index 5ac56ed..6761073 100644
--- a/webkit/port/platform/ScrollViewWin.cpp
+++ b/webkit/port/platform/ScrollViewWin.cpp
@@ -49,7 +49,7 @@
 #include <wtf/HashSet.h>
 
 #undef LOG
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webview_impl.h"
 
@@ -314,7 +314,7 @@ void ScrollView::ScrollViewPrivate::highlightMatches(
     // will not be serialized, i.e. composition is done in the renderer and
     // never in the browser.
     // Prepare for drawing the arrows along the scroll bar.
-    gfx::PlatformCanvas* canvas = PlatformContextToPlatformContextSkia(
+    gfx::PlatformCanvasWin* canvas = PlatformContextToPlatformContextSkia(
         context->platformContext())->canvas();
 
     int horz_start = 0;
diff --git a/webkit/port/platform/graphics/FontWin.cpp b/webkit/port/platform/graphics/FontWin.cpp
index 512a3cf..0287d3f 100644
--- a/webkit/port/platform/graphics/FontWin.cpp
+++ b/webkit/port/platform/graphics/FontWin.cpp
@@ -32,7 +32,7 @@
 #include "SimpleFontData.h"
 #include "UniscribeStateTextRun.h"
 
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "graphics/SkiaUtils.h"
 #include "webkit/glue/webkit_glue.h"
 
diff --git a/webkit/port/platform/graphics/GraphicsContextSkia.cpp b/webkit/port/platform/graphics/GraphicsContextSkia.cpp
index c10cf60..e169a1d 100644
--- a/webkit/port/platform/graphics/GraphicsContextSkia.cpp
+++ b/webkit/port/platform/graphics/GraphicsContextSkia.cpp
@@ -34,7 +34,7 @@
 # include "SkGradientShader.h"
 #endif
 
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 
 using namespace std;
 
@@ -704,7 +704,7 @@ void GraphicsContext::freePlatformPattern(PlatformPattern* shader)
 
 GraphicsContext* GraphicsContext::createOffscreenContext(int width, int height)
 {
-    gfx::PlatformCanvas* canvas = new gfx::PlatformCanvas(width, height, false);
+    gfx::PlatformCanvasWin* canvas = new gfx::PlatformCanvasWin(width, height, false);
     PlatformContextSkia* pgc = new PlatformContextSkia(canvas);
     canvas->drawARGB(0, 0, 0, 0, SkPorterDuff::kClear_Mode);
 
diff --git a/webkit/port/platform/graphics/ImageSkia.cpp b/webkit/port/platform/graphics/ImageSkia.cpp
index d5930e2..359f6c0 100644
--- a/webkit/port/platform/graphics/ImageSkia.cpp
+++ b/webkit/port/platform/graphics/ImageSkia.cpp
@@ -47,7 +47,7 @@
 #include "base/gfx/bitmap_header.h"
 #include "base/gfx/image_operations.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkit_resources.h"
 
@@ -129,8 +129,8 @@ void GetTextAreaResizeCorner(Image* image)
     const int height = PlatformScrollbar::horizontalScrollbarHeight();
 
     // Setup a memory buffer.
-    gfx::PlatformCanvas canvas(width, height, false);
-    gfx::PlatformDevice& device = canvas.getTopPlatformDevice();
+    gfx::PlatformCanvasWin canvas(width, height, false);
+    gfx::PlatformDeviceWin& device = canvas.getTopPlatformDevice();
     device.prepareForGDI(0, 0, width, height);
     HDC hdc = device.getBitmapDC();
     RECT widgetRect = { 0, 0, width, height };
diff --git a/webkit/port/platform/graphics/PlatformContextSkia.cpp b/webkit/port/platform/graphics/PlatformContextSkia.cpp
index 4019578..c2586b3 100644
--- a/webkit/port/platform/graphics/PlatformContextSkia.cpp
+++ b/webkit/port/platform/graphics/PlatformContextSkia.cpp
@@ -31,7 +31,7 @@
 
 #include "PlatformContextSkia.h"
 
-PlatformContextSkia::PlatformContextSkia(gfx::PlatformCanvas* canvas)
+PlatformContextSkia::PlatformContextSkia(gfx::PlatformCanvasWin* canvas)
     : SkGraphicsContext(canvas)
 {
 }
diff --git a/webkit/port/platform/graphics/PlatformContextSkia.h b/webkit/port/platform/graphics/PlatformContextSkia.h
index 83e4e2c..6afde66 100644
--- a/webkit/port/platform/graphics/PlatformContextSkia.h
+++ b/webkit/port/platform/graphics/PlatformContextSkia.h
@@ -47,7 +47,7 @@ class PlatformContextSkia : public SkGraphicsContext {
     friend class WebCore::GraphicsContextPlatformPrivate;
 public:
     // For printing, there shouldn't be any canvas. canvas can be NULL.
-    PlatformContextSkia(gfx::PlatformCanvas* canvas);
+    PlatformContextSkia(gfx::PlatformCanvasWin* canvas);
     ~PlatformContextSkia();
 
 protected:
diff --git a/webkit/port/platform/graphics/SkGraphicsContext.cpp b/webkit/port/platform/graphics/SkGraphicsContext.cpp
index 74cd8ed..0843840 100644
--- a/webkit/port/platform/graphics/SkGraphicsContext.cpp
+++ b/webkit/port/platform/graphics/SkGraphicsContext.cpp
@@ -33,7 +33,7 @@
 
 #include "base/gfx/image_operations.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "base/gfx/skia_utils.h"
 #include "GraphicsContextPrivate.h"
 #include "NativeImageSkia.h"
@@ -146,7 +146,7 @@ void DrawResampledBitmap(SkCanvas& canvas,
 }  // namespace
 
 
-SkGraphicsContext::SkGraphicsContext(gfx::PlatformCanvas* canvas)
+SkGraphicsContext::SkGraphicsContext(gfx::PlatformCanvasWin* canvas)
     : canvas_(canvas),
       paint_context_(NULL),
       own_canvas_(false) {
@@ -425,7 +425,7 @@ const SkBitmap* SkGraphicsContext::bitmap() const
   return &canvas_->getDevice()->accessBitmap(false);
 }
 
-gfx::PlatformCanvas* SkGraphicsContext::canvas() const
+gfx::PlatformCanvasWin* SkGraphicsContext::canvas() const
 {
   return canvas_;
 }
diff --git a/webkit/port/platform/graphics/SkGraphicsContext.h b/webkit/port/platform/graphics/SkGraphicsContext.h
index c97738a..191dbf6 100644
--- a/webkit/port/platform/graphics/SkGraphicsContext.h
+++ b/webkit/port/platform/graphics/SkGraphicsContext.h
@@ -47,7 +47,7 @@ class UniscribeStateTextRun;
 
 namespace gfx {
 class NativeTheme;
-class PlatformCanvas;
+class PlatformCanvasWin;
 }
 
 
@@ -67,7 +67,7 @@ class SkGraphicsContext {
     RESAMPLE_AWESOME,
   };
 
-  SkGraphicsContext(gfx::PlatformCanvas* canvas);
+  SkGraphicsContext(gfx::PlatformCanvasWin* canvas);
   ~SkGraphicsContext();
 
   // Gets the default theme.
@@ -130,7 +130,7 @@ class SkGraphicsContext {
   // 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;
+  gfx::PlatformCanvasWin* 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 possible
@@ -147,7 +147,7 @@ class SkGraphicsContext {
   SkPaintContext* paint_context_;
 
   // Can be NULL when serializing.
-  gfx::PlatformCanvas* canvas_;
+  gfx::PlatformCanvasWin* canvas_;
 
   // Signal that we own the canvas and must delete it on destruction.
   bool own_canvas_;
diff --git a/webkit/port/platform/graphics/SkPaintContext.cpp b/webkit/port/platform/graphics/SkPaintContext.cpp
index 8302153..71ea81f 100644
--- a/webkit/port/platform/graphics/SkPaintContext.cpp
+++ b/webkit/port/platform/graphics/SkPaintContext.cpp
@@ -33,7 +33,7 @@
 #include "SkShader.h"
 #include "SkDashPathEffect.h"
 
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 
 namespace {
 
@@ -127,7 +127,7 @@ struct SkPaintContext::State {
 };
 
 // Context will be NULL if painting should be disabled.
-SkPaintContext::SkPaintContext(gfx::PlatformCanvas* context)
+SkPaintContext::SkPaintContext(gfx::PlatformCanvasWin* context)
       : canvas_(context),
         state_stack_(sizeof(State)) {
   State* state = reinterpret_cast<State*>(state_stack_.push_back());
diff --git a/webkit/port/platform/graphics/SkPaintContext.h b/webkit/port/platform/graphics/SkPaintContext.h
index c56d30f..dd0f215 100644
--- a/webkit/port/platform/graphics/SkPaintContext.h
+++ b/webkit/port/platform/graphics/SkPaintContext.h
@@ -37,7 +37,7 @@
 #include "SkPath.h"
 
 namespace gfx {
-class PlatformCanvas;
+class PlatformCanvasWin;
 }
 
 // This class is the interface to communicate to Skia. It is meant to be as
@@ -60,7 +60,7 @@ class SkPaintContext {
   };
 
   // Context will be NULL if painting should be disabled.
-  SkPaintContext(gfx::PlatformCanvas* context);
+  SkPaintContext(gfx::PlatformCanvasWin* context);
   ~SkPaintContext();
 
   void save();
@@ -103,7 +103,7 @@ class SkPaintContext {
   SkColor fillColor() const;
 
  protected:
-  gfx::PlatformCanvas* canvas() {
+  gfx::PlatformCanvasWin* canvas() {
     return canvas_;
   }
 
@@ -112,7 +112,7 @@ class SkPaintContext {
   struct State;
 
   // NULL indicates painting is disabled. Never delete this object.
-  gfx::PlatformCanvas* canvas_;
+  gfx::PlatformCanvasWin* canvas_;
 
   // States stack. Enables local drawing state change with save()/restore()
   // calls.
diff --git a/webkit/port/platform/graphics/svg/SVGPaintServerSkia.cpp b/webkit/port/platform/graphics/svg/SVGPaintServerSkia.cpp
index 13c1f44..d952f74 100644
--- a/webkit/port/platform/graphics/svg/SVGPaintServerSkia.cpp
+++ b/webkit/port/platform/graphics/svg/SVGPaintServerSkia.cpp
@@ -35,7 +35,7 @@
 #include "GraphicsContext.h"
 #include "RenderPath.h"
 
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "SkiaUtils.h"
 #include "SkDashPathEffect.h"
 
diff --git a/webkit/port/platform/graphics/svg/SkiaSupport.cpp b/webkit/port/platform/graphics/svg/SkiaSupport.cpp
index 2a66850..8e45abe 100644
--- a/webkit/port/platform/graphics/svg/SkiaSupport.cpp
+++ b/webkit/port/platform/graphics/svg/SkiaSupport.cpp
@@ -41,7 +41,7 @@
 #include "SVGPaintServer.h"
 #include "SVGRenderStyle.h"
 
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "SkiaUtils.h"
 #include "SkDashPathEffect.h"
 
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index cbe8561..a256646 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -39,7 +39,7 @@
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
 #include "base/file_util.h"
-#include "base/gfx/bitmap_platform_device.h"
+#include "base/gfx/bitmap_platform_device_win.h"
 #include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/icu_util.h"
@@ -542,7 +542,7 @@ void TestShell::ResizeSubViews() {
 /* static */ std::string TestShell::DumpImage(
         WebFrame* web_frame,
         const std::wstring& file_name) {
-    gfx::BitmapPlatformDevice device(web_frame->CaptureImage(true));
+    gfx::BitmapPlatformDeviceWin device(web_frame->CaptureImage(true));
     const SkBitmap& src_bmp = device.accessBitmap(false);
 
     // Encode image.
diff --git a/webkit/tools/test_shell/webview_host.cc b/webkit/tools/test_shell/webview_host.cc
index 61f66f0..ea59c14 100644
--- a/webkit/tools/test_shell/webview_host.cc
+++ b/webkit/tools/test_shell/webview_host.cc
@@ -29,7 +29,7 @@
 
 #include "webkit/tools/test_shell/webview_host.h"
 
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/win_util.h"
diff --git a/webkit/tools/test_shell/webwidget_host.cc b/webkit/tools/test_shell/webwidget_host.cc
index b037ca9..7b90c60 100644
--- a/webkit/tools/test_shell/webwidget_host.cc
+++ b/webkit/tools/test_shell/webwidget_host.cc
@@ -29,7 +29,7 @@
 
 #include "webkit/tools/test_shell/webwidget_host.h"
 
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/win_util.h"
@@ -227,7 +227,7 @@ void WebWidgetHost::Paint() {
   if (!canvas_.get()) {
     ResetScrollRect();
     paint_rect_ = client_rect;
-    canvas_.reset(new gfx::PlatformCanvas(
+    canvas_.reset(new gfx::PlatformCanvasWin(
         paint_rect_.width(), paint_rect_.height(), true));
   }
 
diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h
index e0dde64..fd4dd87 100644
--- a/webkit/tools/test_shell/webwidget_host.h
+++ b/webkit/tools/test_shell/webwidget_host.h
@@ -39,7 +39,7 @@ class WebWidget;
 class WebWidgetDelegate;
 
 namespace gfx {
-class PlatformCanvas;
+class PlatformCanvasWin;
 class Size;
 }
 
@@ -91,7 +91,7 @@ class WebWidgetHost {
 
   HWND hwnd_;
   WebWidget* webwidget_;
-  scoped_ptr<gfx::PlatformCanvas> canvas_;
+  scoped_ptr<gfx::PlatformCanvasWin> canvas_;
 
   // specifies the portion of the webwidget that needs painting
   gfx::Rect paint_rect_;