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

9 files changed, 23 insertions, 23 deletions

diff --git a/chrome/browser/printing/printed_document.cc b/chrome/browser/printing/printed_document.cc
index fb4d13a..092a69d 100644
--- a/chrome/browser/printing/printed_document.cc
+++ b/chrome/browser/printing/printed_document.cc
@@ -31,7 +31,7 @@
 
 #include <set>
 
-#include "base/gfx/platform_device.h"
+#include "base/gfx/platform_device_win.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/printing/page_number.h"
@@ -126,7 +126,7 @@ void PrintedDocument::RenderPrintedPage(const PrintedPage& page,
   // the device context.
   int saved_state = SaveDC(context);
   DCHECK_NE(saved_state, 0);
-  gfx::PlatformDevice::InitializeDC(context);
+  gfx::PlatformDeviceWin::InitializeDC(context);
   {
     // Save the state (again) to apply the necessary world transformation.
     int saved_state = SaveDC(context);
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index d2b9ff8..87c2c13 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -29,7 +29,7 @@
 
 #include "base/command_line.h"
 #include "base/gfx/bitmap_header.h"
-#include "base/gfx/platform_device.h"
+#include "base/gfx/platform_device_win.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
 #include "base/time.h"
@@ -195,7 +195,7 @@ class Image {
                                       &bits, NULL, 0);
     EXPECT_TRUE(bitmap);
     EXPECT_TRUE(SelectObject(hdc, bitmap));
-    gfx::PlatformDevice::InitializeDC(hdc);
+    gfx::PlatformDeviceWin::InitializeDC(hdc);
     EXPECT_TRUE(emf.Playback(hdc, NULL));
     row_length_ = size_.width() * sizeof(uint32);
     size_t bytes = row_length_ * size_.height();
diff --git a/chrome/browser/printing/win_printing_context.cc b/chrome/browser/printing/win_printing_context.cc
index 81315f3..1e3da12 100644
--- a/chrome/browser/printing/win_printing_context.cc
+++ b/chrome/browser/printing/win_printing_context.cc
@@ -32,7 +32,7 @@
 #include <winspool.h>
 
 #include "base/file_util.h"
-#include "base/gfx/platform_device.h"
+#include "base/gfx/platform_device_win.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/common/gfx/emf.h"
@@ -403,7 +403,7 @@ bool PrintingContext::InitializeSettings(const DEVMODE& dev_mode,
                                          const std::wstring& new_device_name,
                                          const PRINTPAGERANGE* ranges,
                                          int number_ranges) {
-  gfx::PlatformDevice::InitializeDC(hdc_);
+  gfx::PlatformDeviceWin::InitializeDC(hdc_);
   DCHECK(GetDeviceCaps(hdc_, CLIPCAPS));
   DCHECK(GetDeviceCaps(hdc_, RASTERCAPS) & RC_STRETCHDIB);
   DCHECK(GetDeviceCaps(hdc_, RASTERCAPS) & RC_BITMAP64);
diff --git a/chrome/browser/views/theme_helpers.cc b/chrome/browser/views/theme_helpers.cc
index fa2820d..89fb02d 100644
--- a/chrome/browser/views/theme_helpers.cc
+++ b/chrome/browser/views/theme_helpers.cc
@@ -33,7 +33,7 @@
 #include <atlapp.h>
 #include <atltheme.h>
 
-#include "base/gfx/bitmap_platform_device.h"
+#include "base/gfx/bitmap_platform_device_win.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "base/logging.h"
 #include "SkGradientShader.h"
@@ -87,8 +87,8 @@ void GetRebarGradientColors(int width, int x1, int x2, SkColor* c1, SkColor* c2)
   // Extract the color values from the selected pixels
   // The | in the following operations forces the alpha to 0xFF. This is
   // needed as windows sets the alpha to 0 when it renders.
-  gfx::BitmapPlatformDevice& device =
-      static_cast<gfx::BitmapPlatformDevice&>(canvas.getTopPlatformDevice());
+  gfx::BitmapPlatformDeviceWin& device =
+      static_cast<gfx::BitmapPlatformDeviceWin&>(canvas.getTopPlatformDevice());
   *c1 = 0xFF000000 | device.getColorAt(x1, 0);
   *c2 = 0xFF000000 | device.getColorAt(x2, 0);
 }
diff --git a/chrome/common/gfx/chrome_canvas.cc b/chrome/common/gfx/chrome_canvas.cc
index b73a407..9fc776f 100644
--- a/chrome/common/gfx/chrome_canvas.cc
+++ b/chrome/common/gfx/chrome_canvas.cc
@@ -38,10 +38,10 @@
 #include "chrome/common/l10n_util.h"
 
 ChromeCanvas::ChromeCanvas(int width, int height, bool is_opaque)
-    : gfx::PlatformCanvas(width, height, is_opaque) {
+    : gfx::PlatformCanvasWin(width, height, is_opaque) {
 }
 
-ChromeCanvas::ChromeCanvas() : gfx::PlatformCanvas() {
+ChromeCanvas::ChromeCanvas() : gfx::PlatformCanvasWin() {
 }
 
 ChromeCanvas::~ChromeCanvas() {
diff --git a/chrome/common/gfx/chrome_canvas.h b/chrome/common/gfx/chrome_canvas.h
index 4c6d63d..bc29deb 100644
--- a/chrome/common/gfx/chrome_canvas.h
+++ b/chrome/common/gfx/chrome_canvas.h
@@ -33,7 +33,7 @@
 #include <windows.h>
 #include <string>
 #include "base/basictypes.h"
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 
 class ChromeFont;
 namespace gfx {
@@ -56,7 +56,7 @@ class Rect;
 // source and destination colors are combined. Unless otherwise specified,
 // the variant that does not take a SkPorterDuff::Mode uses a transfer mode
 // of kSrcOver_Mode.
-class ChromeCanvas : public gfx::PlatformCanvas {
+class ChromeCanvas : public gfx::PlatformCanvasWin {
  public:
   // Specifies the alignment for text rendered with the DrawStringInt method.
   static const int TEXT_ALIGN_LEFT = 1;
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index 8004cdf..64c96fa 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -32,7 +32,7 @@
 #include "base/command_line.h"
 #include "base/time.h"
 #include "base/gfx/bitmap_header.h"
-#include "base/gfx/platform_device.h"
+#include "base/gfx/platform_device_win.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/common/plugin_messages.h"
@@ -257,7 +257,7 @@ void WebPluginDelegateStub::OnPaint(const PluginMsg_Paint_Params& params) {
     NOTREACHED();
     return;
   }
-  gfx::PlatformDevice::InitializeDC(hdc);
+  gfx::PlatformDeviceWin::InitializeDC(hdc);
   SelectObject(hdc, hbitmap);
   SetWorldTransform(hdc, &params.xf);
 
@@ -274,7 +274,7 @@ void WebPluginDelegateStub::OnPrint(PluginMsg_PrintResponse_Params* params) {
     return;
   }
   HDC hdc = emf.hdc();
-  gfx::PlatformDevice::InitializeDC(hdc);
+  gfx::PlatformDeviceWin::InitializeDC(hdc);
   delegate_->Print(hdc);
   if (!emf.CloseDc()) {
     NOTREACHED();
@@ -305,7 +305,7 @@ void WebPluginDelegateStub::OnPaintIntoSharedMemory(
     return;
   }
   HDC hdc = emf.hdc();
-  gfx::PlatformDevice::InitializeDC(hdc);
+  gfx::PlatformDeviceWin::InitializeDC(hdc);
 
   if (delegate_->windowless()) {
     WindowlessPaint(hdc, params);
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 478efaa..2d93886 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -35,7 +35,7 @@
 
 #include "base/command_line.h"
 #include "base/gfx/bitmap_header.h"
-#include "base/gfx/bitmap_platform_device.h"
+#include "base/gfx/bitmap_platform_device_win.h"
 #include "base/gfx/image_operations.h"
 #include "base/gfx/native_theme.h"
 #include "base/gfx/vector_canvas.h"
@@ -456,7 +456,7 @@ void RenderView::PrintPage(const ViewMsg_PrintPage_Params& params,
   emf.CreateDc(NULL, NULL);
   HDC hdc = emf.hdc();
   DCHECK(hdc);
-  gfx::PlatformDevice::InitializeDC(hdc);
+  gfx::PlatformDeviceWin::InitializeDC(hdc);
 
   gfx::Rect rect;
   frame->GetPageRect(params.page_number, &rect);
@@ -480,7 +480,7 @@ void RenderView::PrintPage(const ViewMsg_PrintPage_Params& params,
   // GDI drawing code fails.
 
   // Mix of Skia and GDI based.
-  gfx::PlatformCanvas canvas(src_size_x, src_size_y, true);
+  gfx::PlatformCanvasWin canvas(src_size_x, src_size_y, true);
   canvas.drawARGB(255, 255, 255, 255, SkPorterDuff::kSrc_Mode);
   PlatformContextSkia context(&canvas);
   if (!frame->SpoolPage(params.page_number, &context)) {
@@ -692,7 +692,7 @@ void RenderView::CaptureThumbnail(WebFrame* frame,
   double begin = time_util::GetHighResolutionTimeNow();
 #endif
 
-  gfx::BitmapPlatformDevice device(frame->CaptureImage(true));
+  gfx::BitmapPlatformDeviceWin device(frame->CaptureImage(true));
   const SkBitmap& src_bmp = device.accessBitmap(false);
 
   SkRect dest_rect;
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 90ec7c6..749fd8c 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -35,7 +35,7 @@
 #include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/platform_canvas_win.h"
 #include "base/scoped_ptr.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webwidget.h"
@@ -368,7 +368,7 @@ void RenderWidget::ClearFocus() {
 }
 
 void RenderWidget::PaintRect(const gfx::Rect& rect, SharedMemory* paint_buf) {
-  gfx::PlatformCanvas canvas(rect.width(), rect.height(), true,
+  gfx::PlatformCanvasWin canvas(rect.width(), rect.height(), true,
       paint_buf->handle());
   // Bring the canvas into the coordinate system of the paint rect
   canvas.translate(static_cast<SkScalar>(-rect.x()),