ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

ui/views/controls/table/table_view_views.cc

 // Copyright (c) 2012 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 "ui/views/controls/table/table_view_views.h"
 
 #include "base/i18n/rtl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/table_model.h"
-#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/native_theme.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
 
 // Padding around the text (on each side).
 static const int kTextVerticalPadding = 3;
 static const int kTextHorizontalPadding = 2;
 
@@ skipping 195 matching lines @@
 void TableView::OnPaint(gfx::Canvas* canvas) {
   // Don't invoke View::OnPaint so that we can render our own focus border.
   OnPaintBackground(canvas);
 
   if (!RowCount())
     return;
 
   int min_y, max_y;
   {
     SkRect sk_clip_rect;
-    if (canvas->GetSkCanvas()->getClipBounds(&sk_clip_rect)) {
+    if (canvas->sk_canvas()->getClipBounds(&sk_clip_rect)) {
       gfx::Rect clip_rect = gfx::SkRectToRect(sk_clip_rect);
       min_y = clip_rect.y();
       max_y = clip_rect.bottom();
     } else {
       gfx::Rect vis_bounds = GetVisibleBounds();
       min_y = vis_bounds.y();
       max_y = vis_bounds.bottom();
     }
   }
 
@@ skipping 43 matching lines @@
 void TableView::NumRowsChanged() {
   PreferredSizeChanged();
   SchedulePaint();
 }
 
 gfx::Rect TableView::GetRowBounds(int row) {
   return gfx::Rect(0, row * row_height_, width(), row_height_);
 }
 
 }  // namespace views