ui/gfx: Get rid of CanvasSkia::GetSkCanvas() function.

BUG=116572
R=asvitkine@chromium.org
TBR=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9663077

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

20 files changed, 54 insertions, 65 deletions

diff --git a/ui/views/background.cc b/ui/views/background.cc
index 5c327dbd..0f3d841 100644
--- a/ui/views/background.cc
+++ b/ui/views/background.cc
@@ -25,7 +25,7 @@ class SolidBackground : public Background {
   void Paint(gfx::Canvas* canvas, View* view) const {
     // Fill the background. Note that we don't constrain to the bounds as
     // canvas is already clipped for us.
-    canvas->GetSkCanvas()->drawColor(get_color());
+    canvas->sk_canvas()->drawColor(get_color());
   }
 
  private:
diff --git a/ui/views/bubble/bubble_border.cc b/ui/views/bubble/bubble_border.cc
index 8012109..30467bf 100644
--- a/ui/views/bubble/bubble_border.cc
+++ b/ui/views/bubble/bubble_border.cc
@@ -490,7 +490,7 @@ void BubbleBorder::DrawArrowInterior(gfx::Canvas* canvas,
   else
     path.lineTo(SkIntToScalar(tip_x + shift_x), SkIntToScalar(tip_y - shift_y));
   path.close();
-  canvas->GetSkCanvas()->drawPath(path, paint);
+  canvas->sk_canvas()->drawPath(path, paint);
 }
 
 /////////////////////////
@@ -499,7 +499,7 @@ void BubbleBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
   // Clip out the client bounds to prevent overlapping transparent widgets.
   if (!border_->client_bounds().IsEmpty()) {
     SkRect client_rect(gfx::RectToSkRect(border_->client_bounds()));
-    canvas->GetSkCanvas()->clipRect(client_rect, SkRegion::kDifference_Op);
+    canvas->sk_canvas()->clipRect(client_rect, SkRegion::kDifference_Op);
   }
 
   // The border of this view creates an anti-aliased round-rect region for the
@@ -515,7 +515,7 @@ void BubbleBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
   bounds.Inset(-border_->border_thickness(), -border_->border_thickness());
   SkScalar radius = SkIntToScalar(BubbleBorder::GetCornerRadius());
   path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
-  canvas->GetSkCanvas()->drawPath(path, paint);
+  canvas->sk_canvas()->drawPath(path, paint);
 }
 
 }  // namespace views
diff --git a/ui/views/controls/button/text_button.cc b/ui/views/controls/button/text_button.cc
index 2f84330..a1549eb 100644
--- a/ui/views/controls/button/text_button.cc
+++ b/ui/views/controls/button/text_button.cc
@@ -139,8 +139,7 @@ void TextButtonBorder::Paint(const View& view, gfx::Canvas* canvas) const {
       // handle the case of having a non-NULL |normal_set_|.
       canvas->SaveLayerAlpha(static_cast<uint8>(
           button->GetAnimation()->CurrentValueBetween(0, 255)));
-      canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255,
-                                      SkXfermode::kClear_Mode);
+      canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
       Paint(view, canvas, *set);
       canvas->Restore();
     } else {
@@ -220,20 +219,20 @@ void TextButtonNativeThemeBorder::Paint(const View& view,
     gfx::NativeTheme::ExtraParams prev_extra;
     gfx::NativeTheme::State prev_state =
         delegate_->GetBackgroundThemeState(&prev_extra);
-    native_theme->Paint(
-        canvas->GetSkCanvas(), part, prev_state, rect, prev_extra);
+    native_theme->Paint(canvas->sk_canvas(), part, prev_state, rect,
+                        prev_extra);
 
     // Composite foreground state above it.
     gfx::NativeTheme::ExtraParams extra;
     gfx::NativeTheme::State state = delegate_->GetForegroundThemeState(&extra);
     int alpha = delegate_->GetThemeAnimation()->CurrentValueBetween(0, 255);
     canvas->SaveLayerAlpha(static_cast<uint8>(alpha));
-    native_theme->Paint(canvas->GetSkCanvas(), part, state, rect, extra);
+    native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
     canvas->Restore();
   } else {
     gfx::NativeTheme::ExtraParams extra;
     gfx::NativeTheme::State state = delegate_->GetThemeState(&extra);
-    native_theme->Paint(canvas->GetSkCanvas(), part, state, rect, extra);
+    native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
   }
 }
 
diff --git a/ui/views/controls/focusable_border.cc b/ui/views/controls/focusable_border.cc
index 6e87758..0f89d37 100644
--- a/ui/views/controls/focusable_border.cc
+++ b/ui/views/controls/focusable_border.cc
@@ -39,7 +39,7 @@ void FocusableBorder::Paint(const View& view, gfx::Canvas* canvas) const {
   paint.setColor(focus_color);
   paint.setStrokeWidth(SkIntToScalar(2));
 
-  canvas->GetSkCanvas()->drawPath(path, paint);
+  canvas->sk_canvas()->drawPath(path, paint);
 }
 
 void FocusableBorder::GetInsets(gfx::Insets* insets) const {
diff --git a/ui/views/controls/menu/menu_item_view_views.cc b/ui/views/controls/menu/menu_item_view_views.cc
index 1019ccb..915798c 100644
--- a/ui/views/controls/menu/menu_item_view_views.cc
+++ b/ui/views/controls/menu/menu_item_view_views.cc
@@ -39,7 +39,7 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
   if (render_selection) {
     SkColor bg_color = gfx::NativeTheme::instance()->GetSystemColor(
         gfx::NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
-    canvas->GetSkCanvas()->drawColor(bg_color, SkXfermode::kSrc_Mode);
+    canvas->sk_canvas()->drawColor(bg_color, SkXfermode::kSrc_Mode);
   }
 
   // Render the check.
diff --git a/ui/views/controls/menu/menu_item_view_win.cc b/ui/views/controls/menu/menu_item_view_win.cc
index add895c..8458e22 100644
--- a/ui/views/controls/menu/menu_item_view_win.cc
+++ b/ui/views/controls/menu/menu_item_view_win.cc
@@ -50,7 +50,7 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
                             height());
     AdjustBoundsForRTLUI(&gutter_bounds);
     NativeTheme::ExtraParams extra;
-    NativeTheme::instance()->Paint(canvas->GetSkCanvas(),
+    NativeTheme::instance()->Paint(canvas->sk_canvas(),
                                    NativeTheme::kMenuPopupGutter,
                                    NativeTheme::kNormal,
                                    gutter_bounds,
@@ -63,7 +63,7 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
     NativeTheme::ExtraParams extra;
     extra.menu_item.is_selected = render_selection;
     AdjustBoundsForRTLUI(&item_bounds);
-    NativeTheme::instance()->Paint(canvas->GetSkCanvas(),
+    NativeTheme::instance()->Paint(canvas->sk_canvas(),
         NativeTheme::kMenuItemBackground, control_state, item_bounds, extra);
   }
 
@@ -127,7 +127,7 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
     gfx::NativeTheme::ExtraParams extra;
     extra.menu_arrow.pointing_right = !base::i18n::IsRTL();
     extra.menu_arrow.is_selected = render_selection;
-    gfx::NativeTheme::instance()->Paint(canvas->GetSkCanvas(),
+    gfx::NativeTheme::instance()->Paint(canvas->sk_canvas(),
         gfx::NativeTheme::kMenuPopupArrow, control_state, arrow_bounds, extra);
   }
 }
@@ -157,13 +157,13 @@ void MenuItemView::PaintCheck(gfx::Canvas* canvas,
   // Draw the background.
   gfx::Rect bg_bounds(0, 0, icon_x + icon_width, height());
   AdjustBoundsForRTLUI(&bg_bounds);
-  NativeTheme::instance()->Paint(canvas->GetSkCanvas(),
+  NativeTheme::instance()->Paint(canvas->sk_canvas(),
       NativeTheme::kMenuCheckBackground, state, bg_bounds, extra);
 
   // And the check.
   gfx::Rect icon_bounds(icon_x / 2, icon_y, icon_width, icon_height);
   AdjustBoundsForRTLUI(&icon_bounds);
-  NativeTheme::instance()->Paint(canvas->GetSkCanvas(),
+  NativeTheme::instance()->Paint(canvas->sk_canvas(),
       NativeTheme::kMenuCheck, state, bg_bounds, extra);
 }
 
diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc
index 5db0cd5..5d6c414 100644
--- a/ui/views/controls/menu/menu_scroll_view_container.cc
+++ b/ui/views/controls/menu/menu_scroll_view_container.cc
@@ -81,7 +81,7 @@ class MenuScrollButton : public View {
     gfx::Rect item_bounds(0, 0, width(), height());
     NativeTheme::ExtraParams extra;
     extra.menu_item.is_selected = false;
-    NativeTheme::instance()->Paint(canvas->GetSkCanvas(),
+    NativeTheme::instance()->Paint(canvas->sk_canvas(),
                                    NativeTheme::kMenuItemBackground,
                                    NativeTheme::kNormal, item_bounds, extra);
 #if defined(OS_WIN)
@@ -183,7 +183,7 @@ void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {
 #endif
   gfx::Rect bounds(0, 0, width(), height());
   NativeTheme::ExtraParams extra;
-  NativeTheme::instance()->Paint(canvas->GetSkCanvas(),
+  NativeTheme::instance()->Paint(canvas->sk_canvas(),
       NativeTheme::kMenuPopupBackground, NativeTheme::kNormal, bounds, extra);
 #if defined(OS_WIN)
   canvas->EndPlatformPaint();
diff --git a/ui/views/controls/menu/menu_separator_win.cc b/ui/views/controls/menu/menu_separator_win.cc
index 6630290..a5769140 100644
--- a/ui/views/controls/menu/menu_separator_win.cc
+++ b/ui/views/controls/menu/menu_separator_win.cc
@@ -28,7 +28,7 @@ void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
         config.gutter_to_label - config.gutter_width, 0,
         config.gutter_width, height());
     gfx::NativeTheme::ExtraParams extra;
-    theme->Paint(canvas->GetSkCanvas(), gfx::NativeTheme::kMenuPopupGutter,
+    theme->Paint(canvas->sk_canvas(), gfx::NativeTheme::kMenuPopupGutter,
                  gfx::NativeTheme::kNormal, gutter_bounds, extra);
     start_x = gutter_bounds.x() + config.gutter_width;
   }
@@ -36,7 +36,7 @@ void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect separator_bounds(start_x, 0, width(), height());
   gfx::NativeTheme::ExtraParams extra;
   extra.menu_separator.has_gutter = config.render_gutter;
-  theme->Paint(canvas->GetSkCanvas(), gfx::NativeTheme::kMenuPopupSeparator,
+  theme->Paint(canvas->sk_canvas(), gfx::NativeTheme::kMenuPopupSeparator,
                gfx::NativeTheme::kNormal, separator_bounds, extra);
 }
 
diff --git a/ui/views/controls/progress_bar.cc b/ui/views/controls/progress_bar.cc
index 5fd6c46..38efc08 100644
--- a/ui/views/controls/progress_bar.cc
+++ b/ui/views/controls/progress_bar.cc
@@ -87,7 +87,7 @@ void FillRoundRect(gfx::Canvas* canvas,
   // Need to unref shader, otherwise never deleted.
   s->unref();
 
-  canvas->GetSkCanvas()->drawPath(path, paint);
+  canvas->sk_canvas()->drawPath(path, paint);
 }
 
 void FillRoundRect(gfx::Canvas* canvas,
@@ -108,7 +108,7 @@ void FillRoundRect(gfx::Canvas* canvas,
     paint.setStyle(SkPaint::kFill_Style);
     paint.setFlags(SkPaint::kAntiAlias_Flag);
     paint.setColor(gradient_start_color);
-    canvas->GetSkCanvas()->drawPath(path, paint);
+    canvas->sk_canvas()->drawPath(path, paint);
   }
 }
 
@@ -126,7 +126,7 @@ void StrokeRoundRect(gfx::Canvas* canvas,
   paint.setStyle(SkPaint::kStroke_Style);
   paint.setFlags(SkPaint::kAntiAlias_Flag);
   paint.setStrokeWidth(SkIntToScalar(stroke_width));
-  canvas->GetSkCanvas()->drawPath(path, paint);
+  canvas->sk_canvas()->drawPath(path, paint);
 }
 
 }  // namespace
@@ -252,7 +252,7 @@ void ProgressBar::OnPaint(gfx::Canvas* canvas) {
 
     // Draw inner stroke and shadow if wide enough.
     if (progress_width > 2 * kBorderWidth) {
-      canvas->GetSkCanvas()->save();
+      canvas->sk_canvas()->save();
 
       SkPath inner_path;
       AddRoundRectPathWithPadding(
@@ -260,7 +260,7 @@ void ProgressBar::OnPaint(gfx::Canvas* canvas) {
           kCornerRadius,
           SkIntToScalar(kBorderWidth),
           &inner_path);
-      canvas->GetSkCanvas()->clipPath(inner_path);
+      canvas->sk_canvas()->clipPath(inner_path);
 
       // Draw bar inner stroke
       StrokeRoundRect(canvas,
@@ -278,7 +278,7 @@ void ProgressBar::OnPaint(gfx::Canvas* canvas) {
                       bar_inner_shadow_color,
                       kBorderWidth);
 
-      canvas->GetSkCanvas()->restore();
+      canvas->sk_canvas()->restore();
     }
 
     // Draw bar stroke
diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.cc b/ui/views/controls/scrollbar/native_scroll_bar_views.cc
index e82c189..bc737d6 100644
--- a/ui/views/controls/scrollbar/native_scroll_bar_views.cc
+++ b/ui/views/controls/scrollbar/native_scroll_bar_views.cc
@@ -95,14 +95,9 @@ gfx::Size ScrollBarButton::GetPreferredSize() {
 
 void ScrollBarButton::OnPaint(gfx::Canvas* canvas) {
   const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
-  gfx::Rect bounds;
-  bounds.set_size(GetPreferredSize());
-
-  native_theme->Paint(canvas->GetSkCanvas(),
-                      GetNativeThemePart(),
-                      GetNativeThemeState(),
-                      bounds,
-                      GetNativeThemeParams());
+  gfx::Rect bounds(GetPreferredSize());
+  native_theme->Paint(canvas->sk_canvas(), GetNativeThemePart(),
+                      GetNativeThemeState(), bounds, GetNativeThemeParams());
 }
 
 gfx::NativeTheme::ExtraParams
@@ -183,7 +178,7 @@ gfx::Size ScrollBarThumb::GetPreferredSize() {
 void ScrollBarThumb::OnPaint(gfx::Canvas* canvas) {
   const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
 
-  native_theme->Paint(canvas->GetSkCanvas(),
+  native_theme->Paint(canvas->sk_canvas(),
                       GetNativeThemePart(),
                       GetNativeThemeState(),
                       GetLocalBounds(),
@@ -302,12 +297,7 @@ void NativeScrollBarViews::OnPaint(gfx::Canvas* canvas) {
   params_.scrollbar_track.track_width = bounds.width();
   params_.scrollbar_track.track_height = bounds.height();
 
-
-  native_theme->Paint(canvas->GetSkCanvas(),
-                      part_,
-                      state_,
-                      bounds,
-                      params_);
+  native_theme->Paint(canvas->sk_canvas(), part_, state_, bounds, params_);
 }
 
 gfx::Size NativeScrollBarViews::GetPreferredSize() {
diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc
index 5388b5a..2721335 100644
--- a/ui/views/controls/slider.cc
+++ b/ui/views/controls/slider.cc
@@ -132,7 +132,7 @@ void Slider::OnPaint(gfx::Canvas* canvas) {
   paint.setStyle(SkPaint::kFill_Style);
   paint.setAntiAlias(true);
   paint.setColor(kButtonColor);
-  canvas->GetSkCanvas()->drawCircle(button_cx, button_cy, kButtonRadius, paint);
+  canvas->sk_canvas()->drawCircle(button_cx, button_cy, kButtonRadius, paint);
   View::OnPaint(canvas);
 }
 
diff --git a/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index 580b4cf..c5ce487 100644
--- a/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -41,7 +41,7 @@ class TabBackground : public Background {
     gfx::Rect r(0, 0, view->width(), view->height());
     gfx::NativeTheme::ExtraParams extra;
     gfx::NativeTheme::instance()->Paint(
-        canvas->GetSkCanvas(), gfx::NativeTheme::kTabPanelBackground,
+        canvas->sk_canvas(), gfx::NativeTheme::kTabPanelBackground,
         gfx::NativeTheme::kNormal, r, extra);
   }
 
diff --git a/ui/views/controls/tree/tree_view_views.cc b/ui/views/controls/tree/tree_view_views.cc
index 2708d765..44753fd 100644
--- a/ui/views/controls/tree/tree_view_views.cc
+++ b/ui/views/controls/tree/tree_view_views.cc
@@ -516,7 +516,7 @@ void TreeView::OnPaint(gfx::Canvas* canvas) {
   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();
diff --git a/ui/views/native_theme_painter.cc b/ui/views/native_theme_painter.cc
index 1c5c1a1..2fab60e 100644
--- a/ui/views/native_theme_painter.cc
+++ b/ui/views/native_theme_painter.cc
@@ -36,20 +36,20 @@ void NativeThemePainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
     gfx::NativeTheme::ExtraParams prev_extra;
     gfx::NativeTheme::State prev_state =
         delegate_->GetBackgroundThemeState(&prev_extra);
-    native_theme->Paint(
-        canvas->GetSkCanvas(), part, prev_state, rect, prev_extra);
+    native_theme->Paint(canvas->sk_canvas(), part, prev_state, rect,
+                        prev_extra);
 
     // Composite foreground state above it.
     gfx::NativeTheme::ExtraParams extra;
     gfx::NativeTheme::State state = delegate_->GetForegroundThemeState(&extra);
     int alpha = delegate_->GetThemeAnimation()->CurrentValueBetween(0, 255);
     canvas->SaveLayerAlpha(static_cast<uint8>(alpha));
-    native_theme->Paint(canvas->GetSkCanvas(), part, state, rect, extra);
+    native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
     canvas->Restore();
   } else {
     gfx::NativeTheme::ExtraParams extra;
     gfx::NativeTheme::State state = delegate_->GetThemeState(&extra);
-    native_theme->Paint(canvas->GetSkCanvas(), part, state, rect, extra);
+    native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
   }
 }
 
diff --git a/ui/views/painter.cc b/ui/views/painter.cc
index f768445..32ca73a 100644
--- a/ui/views/painter.cc
+++ b/ui/views/painter.cc
@@ -47,9 +47,9 @@ class GradientPainter : public Painter {
     // Need to unref shader, otherwise never deleted.
     s->unref();
 
-    canvas->GetSkCanvas()->drawRectCoords(SkIntToScalar(0), SkIntToScalar(0),
-                                          SkIntToScalar(size.width()),
-                                          SkIntToScalar(size.height()), paint);
+    canvas->sk_canvas()->drawRectCoords(SkIntToScalar(0), SkIntToScalar(0),
+                                        SkIntToScalar(size.width()),
+                                        SkIntToScalar(size.height()), paint);
   }
 
  private:
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc
index 694d5ee..a0952a9 100644
--- a/ui/views/touchui/touch_selection_controller_impl.cc
+++ b/ui/views/touchui/touch_selection_controller_impl.cc
@@ -78,7 +78,7 @@ void PaintCircle(const Circle& circle, gfx::Canvas* canvas) {
                    circle.radius * 2);
   SkScalar radius = SkIntToScalar(circle.radius);
   path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
-  canvas->GetSkCanvas()->drawPath(path, paint);
+  canvas->sk_canvas()->drawPath(path, paint);
 }
 
 // The points may not match exactly, since the selection range computation may
@@ -275,8 +275,8 @@ class TouchSelectionControllerImpl::TouchContextMenuView
 
     canvas->DrawRect(GetLocalBounds(), paint);
 #else
-    canvas->GetSkCanvas()->drawColor(SkColorSetRGB(210, 225, 246),
-                                     SkXfermode::kSrc_Mode);
+    canvas->sk_canvas()->drawColor(SkColorSetRGB(210, 225, 246),
+                                   SkXfermode::kSrc_Mode);
 #endif
   }
 
diff --git a/ui/views/view.cc b/ui/views/view.cc
index fb9e774..6c09464 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -1123,8 +1123,8 @@ void View::OnPaint(gfx::Canvas* canvas) {
 void View::OnPaintBackground(gfx::Canvas* canvas) {
   if (background_.get()) {
     TRACE_EVENT2("views", "View::OnPaintBackground",
-                 "width", canvas->GetSkCanvas()->getDevice()->width(),
-                 "height", canvas->GetSkCanvas()->getDevice()->height());
+                 "width", canvas->sk_canvas()->getDevice()->width(),
+                 "height", canvas->sk_canvas()->getDevice()->height());
     background_->Paint(canvas, this);
   }
 }
@@ -1132,8 +1132,8 @@ void View::OnPaintBackground(gfx::Canvas* canvas) {
 void View::OnPaintBorder(gfx::Canvas* canvas) {
   if (border_.get()) {
     TRACE_EVENT2("views", "View::OnPaintBorder",
-                 "width", canvas->GetSkCanvas()->getDevice()->width(),
-                 "height", canvas->GetSkCanvas()->getDevice()->height());
+                 "width", canvas->sk_canvas()->getDevice()->width(),
+                 "height", canvas->sk_canvas()->getDevice()->height());
     border_->Paint(*this, canvas);
   }
 }
@@ -1141,8 +1141,8 @@ void View::OnPaintBorder(gfx::Canvas* canvas) {
 void View::OnPaintFocusBorder(gfx::Canvas* canvas) {
   if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
     TRACE_EVENT2("views", "views::OnPaintFocusBorder",
-                 "width", canvas->GetSkCanvas()->getDevice()->width(),
-                 "height", canvas->GetSkCanvas()->getDevice()->height());
+                 "width", canvas->sk_canvas()->getDevice()->width(),
+                 "height", canvas->sk_canvas()->getDevice()->height());
     canvas->DrawFocusRect(GetLocalBounds());
   }
 }
@@ -1232,7 +1232,7 @@ void View::UpdateChildLayerBounds(const gfx::Point& offset) {
 
 void View::OnPaintLayer(gfx::Canvas* canvas) {
   if (!layer() || !layer()->fills_bounds_opaquely())
-    canvas->GetSkCanvas()->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
+    canvas->sk_canvas()->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
   PaintCommon(canvas);
 }
 
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 6caa4e5..39b31f0 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -585,7 +585,7 @@ TEST_F(ViewTest, GestureEvent) {
 ////////////////////////////////////////////////////////////////////////////////
 
 void TestView::Paint(gfx::Canvas* canvas) {
-  canvas->GetSkCanvas()->getClipBounds(&last_clip_);
+  canvas->sk_canvas()->getClipBounds(&last_clip_);
 }
 
 void TestView::SchedulePaintInRect(const gfx::Rect& rect) {
diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc
index 34edb3c..4bf18036 100644
--- a/ui/views/widget/root_view.cc
+++ b/ui/views/widget/root_view.cc
@@ -495,7 +495,7 @@ void RootView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
 
 void RootView::OnPaint(gfx::Canvas* canvas) {
   if (!layer() || !layer()->fills_bounds_opaquely())
-    canvas->GetSkCanvas()->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
+    canvas->sk_canvas()->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
 
   // TODO (pkotwicz): Remove this once we switch over to Aura desktop.
   // This is needed so that we can set the background behind the RWHV when the
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index c7319da1..1738162 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -445,7 +445,7 @@ void DialogClientView::PaintSizeBox(gfx::Canvas* canvas) {
     size_box_bounds_.set_x(size_box_bounds_.right() - gripper_size.width());
     size_box_bounds_.set_y(size_box_bounds_.bottom() - gripper_size.height());
 
-    gfx::NativeTheme::instance()->Paint(canvas->GetSkCanvas(),
+    gfx::NativeTheme::instance()->Paint(canvas->sk_canvas(),
                                         gfx::NativeTheme::kWindowResizeGripper,
                                         gfx::NativeTheme::kNormal,
                                         size_box_bounds_,