Canvas refactoring part 2....

chrome/browser/views/tab_contents/tab_contents_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/views/tab_contents/tab_contents_view_win.h"
 
 #include <windows.h>
 
 #include "app/os_exchange_data.h"
 #include "base/file_path.h"
 #include "base/keyboard_codes.h"
 #include "base/time.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser.h"  // TODO(beng): this dependency is awful.
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_request_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/web_drop_target_win.h"
 #include "chrome/browser/views/sad_tab_view.h"
 #include "chrome/browser/views/tab_contents/render_view_context_menu_views.h"
 #include "chrome/browser/views/tab_contents/tab_contents_drag_win.h"
-#include "gfx/canvas_paint.h"
+#include "gfx/canvas_skia_paint.h"
 #include "views/focus/view_storage.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationNone;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebInputEvent;
 
 // static
@@ skipping 346 matching lines @@
 void TabContentsViewWin::OnPaint(HDC junk_dc) {
   if (tab_contents()->render_view_host() &&
       !tab_contents()->render_view_host()->IsRenderViewLive()) {
     if (sad_tab_ == NULL) {
       sad_tab_ = new SadTabView(tab_contents());
       SetContentsView(sad_tab_);
     }
     CRect cr;
     GetClientRect(&cr);
     sad_tab_->SetBounds(gfx::Rect(cr));
-    gfx::CanvasPaint canvas(GetNativeView(), true);
-    sad_tab_->ProcessPaint(&canvas);
+    gfx::CanvasSkiaPaint canvas(GetNativeView(), true);
+    sad_tab_->ProcessPaint(canvas.AsCanvas());
     return;
   }
 
   // We need to do this to validate the dirty area so we don't end up in a
   // WM_PAINTstorm that causes other mysterious bugs (such as WM_TIMERs not
   // firing etc). It doesn't matter that we don't have any non-clipped area.
   CPaintDC dc(GetNativeView());
   SetMsgHandled(FALSE);
 }
 
@@ skipping 145 matching lines @@
   }
   return false;
 }
 
 void TabContentsViewWin::WheelZoom(int distance) {
   if (tab_contents()->delegate()) {
     bool zoom_in = distance > 0;
     tab_contents()->delegate()->ContentsZoomChange(zoom_in);
   }
 }