Canvas refactoring part 2....

chrome/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/renderer_host/gpu_view_host.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "gfx/gdi_util.h"
 #include "gfx/rect.h"
 #include "grit/webkit_resources.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/focus/focus_manager.h"
 #include "views/focus/focus_util_win.h"
 // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h!
@@ skipping 184 matching lines @@
     SetParent(window, NULL);
   }
   return TRUE;
 }
 
 // Draw the contents of |backing_store_dc| onto |paint_rect| with a 70% grey
 // filter.
 void DrawDeemphasized(const gfx::Rect& paint_rect,
                       HDC backing_store_dc,
                       HDC paint_dc) {
-  gfx::Canvas canvas(paint_rect.width(), paint_rect.height(), true);
+  gfx::CanvasSkia canvas(paint_rect.width(), paint_rect.height(), true);
   HDC dc = canvas.beginPlatformPaint();
   BitBlt(dc,
          0,
          0,
          paint_rect.width(),
          paint_rect.height(),
          backing_store_dc,
          paint_rect.x(),
          paint_rect.y(),
          SRCCOPY);
@@ skipping 420 matching lines @@
   EnumChildWindows(m_hWnd, EnumChildProc, lparam);
 }
 
 void RenderWidgetHostViewWin::DrawResizeCorner(const gfx::Rect& paint_rect,
                                                HDC dc) {
   gfx::Rect resize_corner_rect =
       render_widget_host_->GetRootWindowResizerRect();
   if (!paint_rect.Intersect(resize_corner_rect).IsEmpty()) {
     SkBitmap* bitmap = ResourceBundle::GetSharedInstance().
         GetBitmapNamed(IDR_TEXTAREA_RESIZER);
-    gfx::Canvas canvas(bitmap->width(), bitmap->height(), false);
+    gfx::CanvasSkia canvas(bitmap->width(), bitmap->height(), false);
     canvas.getDevice()->accessBitmap(true).eraseARGB(0, 0, 0, 0);
     int x = resize_corner_rect.x() + resize_corner_rect.width() -
         bitmap->width();
     bool rtl_dir = base::i18n::IsRTL();
     if (rtl_dir) {
       canvas.TranslateInt(bitmap->width(), 0);
       canvas.ScaleInt(-1, 1);
       canvas.save();
       x = 0;
     }
@@ skipping 293 matching lines @@
   } else {
     DrawBackground(paint_dc.m_ps.rcPaint, &paint_dc);
     if (whiteout_start_time_.is_null())
       whiteout_start_time_ = TimeTicks::Now();
   }
 }
 
 void RenderWidgetHostViewWin::DrawBackground(const RECT& dirty_rect,
                                              CPaintDC* dc) {
   if (!background_.empty()) {
-    gfx::Canvas canvas(dirty_rect.right - dirty_rect.left,
-                       dirty_rect.bottom - dirty_rect.top,
-                       true);  // opaque
+    gfx::CanvasSkia canvas(dirty_rect.right - dirty_rect.left,
+                           dirty_rect.bottom - dirty_rect.top,
+                           true);  // opaque
     canvas.TranslateInt(-dirty_rect.left, -dirty_rect.top);
 
     const RECT& dc_rect = dc->m_ps.rcPaint;
     canvas.TileImageInt(background_, 0, 0,
                         dc_rect.right - dc_rect.left,
                         dc_rect.bottom - dc_rect.top);
 
     canvas.getTopPlatformDevice().drawToHDC(*dc, dirty_rect.left,
                                             dirty_rect.top, NULL);
   } else {
@@ skipping 707 matching lines @@
     RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
         gfx::NativeView native_view) {
   if (::IsWindow(native_view)) {
     HANDLE raw_render_host_view = ::GetProp(native_view,
                                             kRenderWidgetHostViewKey);
     if (raw_render_host_view)
       return reinterpret_cast<RenderWidgetHostView*>(raw_render_host_view);
   }
   return NULL;
 }