diff options
53 files changed, 127 insertions, 153 deletions
diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc index 485b3a4..5a8e856 100644 --- a/ash/system/audio/tray_volume.cc +++ b/ash/system/audio/tray_volume.cc @@ -81,7 +81,7 @@ class VolumeButton : public views::ToggleImageButton { SkPaint paint; paint.setColor(SkColorSetARGB(63, 0, 0, 0)); paint.setStrokeWidth(SkIntToScalar(3)); - canvas->GetSkCanvas()->drawLine(SkIntToScalar(width() - 10), + canvas->sk_canvas()->drawLine(SkIntToScalar(width() - 10), SkIntToScalar(10), SkIntToScalar(10), SkIntToScalar(height() - 10), paint); } diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index 6e80baa..32d4a4e 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -138,12 +138,12 @@ class SystemTrayBubbleBorder : public views::Border { SkPaint paint; paint.setStyle(SkPaint::kFill_Style); paint.setColor(kBackgroundColor); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); // Now the draw the outline. paint.setStyle(SkPaint::kStroke_Style); paint.setColor(kDarkColor); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); } virtual void GetInsets(gfx::Insets* insets) const OVERRIDE { @@ -173,7 +173,7 @@ class SystemTrayBackground : public views::Background { gfx::Rect bounds(view->GetContentsBounds()); SkScalar radius = SkIntToScalar(4); path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); } bool hovering_; diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc index 177a7f7..9492cfc 100644 --- a/ash/wm/frame_painter.cc +++ b/ash/wm/frame_painter.cc @@ -83,7 +83,7 @@ void TileRoundRect(gfx::Canvas* canvas, // CreateBitmapShader returns a Shader with a reference count of one, we // need to unref after paint takes ownership of the shader. shader->unref(); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); } } // namespace diff --git a/chrome/browser/chromeos/frame/bubble_frame_view.cc b/chrome/browser/chromeos/frame/bubble_frame_view.cc index ad6cb18..9398222 100644 --- a/chrome/browser/chromeos/frame/bubble_frame_view.cc +++ b/chrome/browser/chromeos/frame/bubble_frame_view.cc @@ -231,7 +231,7 @@ void BubbleFrameView::OnPaint(gfx::Canvas* canvas) { rect.set(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()), SkIntToScalar(bounds.right()), SkIntToScalar(bounds.bottom())); path.addRect(rect); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); } void BubbleFrameView::ButtonPressed(views::Button* sender, diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index 79c27ae..575845e 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -100,7 +100,7 @@ class TitleBackgroundPainter : public views::Painter { paint.setShader(s); // Need to unref shader, otherwise never deleted. s->unref(); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); } PanelController* panel_controller_; diff --git a/chrome/browser/chromeos/login/rounded_rect_painter.cc b/chrome/browser/chromeos/login/rounded_rect_painter.cc index b7927d5..e2fcd87 100644 --- a/chrome/browser/chromeos/login/rounded_rect_painter.cc +++ b/chrome/browser/chromeos/login/rounded_rect_painter.cc @@ -46,7 +46,8 @@ void DrawRoundedRect(gfx::Canvas* canvas, } else { paint.setColor(top_color); } - canvas->GetSkCanvas()->drawPath(path, paint); + + canvas->sk_canvas()->drawPath(path, paint); } void DrawRoundedRectShadow(gfx::Canvas* canvas, @@ -63,7 +64,7 @@ void DrawRoundedRectShadow(gfx::Canvas* canvas, paint.setMaskFilter(filter)->unref(); SkRect inset_rect(rect); inset_rect.inset(SkIntToScalar(shadow / 2), SkIntToScalar(shadow / 2)); - canvas->GetSkCanvas()->drawRoundRect( + canvas->sk_canvas()->drawRoundRect( inset_rect, SkIntToScalar(corner_radius), SkIntToScalar(corner_radius), paint); @@ -77,7 +78,7 @@ void DrawRectWithBorder(gfx::Canvas* canvas, if (border->padding > 0) { SkPaint paint; paint.setColor(border->padding_color); - canvas->GetSkCanvas()->drawRect(rect, paint); + canvas->sk_canvas()->drawRect(rect, paint); rect.inset(SkIntToScalar(border->padding), SkIntToScalar(border->padding)); } if (border->shadow > 0) { @@ -163,12 +164,12 @@ class RoundedBackground : public views::Background { paint.setStyle(SkPaint::kFill_Style); paint.setFlags(SkPaint::kAntiAlias_Flag); paint.setColor(get_color()); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); // Redraw boundary region with correspoinding color. paint.setStyle(SkPaint::kStroke_Style); paint.setStrokeWidth(SkIntToScalar(stroke_width_)); paint.setColor(stroke_color_); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); } private: diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index fdab48e..aeb49ea 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -259,7 +259,7 @@ void PaintDownloadProgress(gfx::Canvas* canvas, foreground_paint.setShader(shader); foreground_paint.setAntiAlias(true); shader->unref(); - canvas->GetSkCanvas()->drawPath(path, foreground_paint); + canvas->sk_canvas()->drawPath(path, foreground_paint); return; } @@ -299,7 +299,7 @@ void PaintDownloadComplete(gfx::Canvas* canvas, PI/2) / 2 + 0.5; canvas->SaveLayerAlpha(static_cast<int>(255.0 * opacity), complete_bounds); - canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); canvas->DrawBitmapInt(*complete, complete_bounds.x(), complete_bounds.y()); canvas->Restore(); } @@ -335,7 +335,7 @@ void PaintDownloadInterrupted(gfx::Canvas* canvas, 0.5; canvas->SaveLayerAlpha(static_cast<int>(255.0 * opacity), complete_bounds); - canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); canvas->DrawBitmapInt(*complete, complete_bounds.x(), complete_bounds.y()); canvas->Restore(); } diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc index f15f5d7..1a14da9c 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -575,7 +575,7 @@ void AutocompletePopupContentsView::OnPaint(gfx::Canvas* canvas) { gfx::Path path; MakeContentsPath(&path, GetContentsBounds()); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); // Now we paint the border, so it will be alpha-blended atop the contents. // This looks slightly better in the corners than drawing the contents atop @@ -641,7 +641,7 @@ void AutocompletePopupContentsView::MakeCanvasTransparent( // Allow the window blur effect to show through the popup background. SkAlpha alpha = GetThemeProvider()->ShouldUseNativeFrame() ? kGlassPopupAlpha : kOpaquePopupAlpha; - canvas->GetSkCanvas()->drawColor(SkColorSetA( + canvas->sk_canvas()->drawColor(SkColorSetA( AutocompleteResultView::GetColor(AutocompleteResultView::NORMAL, AutocompleteResultView::BACKGROUND), alpha), SkXfermode::kDstIn_Mode); } diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc index 9ca237d..e00fd60 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc @@ -592,7 +592,7 @@ void AutocompleteResultView::OnBoundsChanged( void AutocompleteResultView::OnPaint(gfx::Canvas* canvas) { const ResultViewState state = GetState(); if (state != NORMAL) - canvas->GetSkCanvas()->drawColor(GetColor(state, BACKGROUND)); + canvas->sk_canvas()->drawColor(GetColor(state, BACKGROUND)); if (!match_.associated_keyword.get() || keyword_icon_->x() > icon_bounds_.right()) { diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 2654dd1..2ec3745 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -21,8 +21,8 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/pref_names.h" -#include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_delegate.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" @@ -178,8 +178,8 @@ void AppInfoView::OnPaint(gfx::Canvas* canvas) { border_paint.setAntiAlias(true); border_paint.setARGB(0xFF, 0xC8, 0xC8, 0xC8); - canvas->GetSkCanvas()->drawRoundRect( - border_rect, SkIntToScalar(2), SkIntToScalar(2), border_paint); + canvas->sk_canvas()->drawRoundRect(border_rect, SkIntToScalar(2), + SkIntToScalar(2), border_paint); SkRect inner_rect = { border_rect.fLeft + SkDoubleToScalar(0.5), @@ -191,8 +191,8 @@ void AppInfoView::OnPaint(gfx::Canvas* canvas) { SkPaint inner_paint; inner_paint.setAntiAlias(true); inner_paint.setARGB(0xFF, 0xF8, 0xF8, 0xF8); - canvas->GetSkCanvas()->drawRoundRect( - inner_rect, SkDoubleToScalar(1.5), SkDoubleToScalar(1.5), inner_paint); + canvas->sk_canvas()->drawRoundRect(inner_rect, SkDoubleToScalar(1.5), + SkDoubleToScalar(1.5), inner_paint); } } // namespace diff --git a/chrome/browser/ui/views/detachable_toolbar_view.cc b/chrome/browser/ui/views/detachable_toolbar_view.cc index e067883c..1e3abdc 100644 --- a/chrome/browser/ui/views/detachable_toolbar_view.cc +++ b/chrome/browser/ui/views/detachable_toolbar_view.cc @@ -70,7 +70,7 @@ void DetachableToolbarView::PaintContentAreaBackground( paint.setAntiAlias(true); paint.setColor(theme_provider->GetColor(ThemeService::COLOR_TOOLBAR)); - canvas->GetSkCanvas()->drawRoundRect( + canvas->sk_canvas()->drawRoundRect( rect, SkDoubleToScalar(roundness), SkDoubleToScalar(roundness), paint); } @@ -85,7 +85,7 @@ void DetachableToolbarView::PaintContentAreaBorder( border_paint.setAlpha(96); border_paint.setAntiAlias(true); - canvas->GetSkCanvas()->drawRoundRect( + canvas->sk_canvas()->drawRoundRect( rect, SkDoubleToScalar(roundness), SkDoubleToScalar(roundness), border_paint); } @@ -106,7 +106,7 @@ void DetachableToolbarView::PaintVerticalDivider( SkIntToScalar(vertical_padding + 1), SkIntToScalar(x + 1), SkIntToScalar(height / 2) }; - canvas->GetSkCanvas()->drawRect(rc, paint); + canvas->sk_canvas()->drawRect(rc, paint); // Draw the lower half of the divider. SkPaint paint_down; @@ -116,5 +116,5 @@ void DetachableToolbarView::PaintVerticalDivider( SkIntToScalar(height / 2), SkIntToScalar(x + 1), SkIntToScalar(height - vertical_padding) }; - canvas->GetSkCanvas()->drawRect(rc_down, paint_down); + canvas->sk_canvas()->drawRect(rc_down, paint_down); } diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index 7d61f93..4c20aa9 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -742,7 +742,7 @@ void DownloadItemView::OnPaint(gfx::Canvas* canvas) { body_hover_animation_->GetCurrentValue() > 0) { canvas->SaveLayerAlpha( static_cast<int>(body_hover_animation_->GetCurrentValue() * 255)); - canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); int x = kLeftPadding; PaintBitmaps(canvas, @@ -776,8 +776,7 @@ void DownloadItemView::OnPaint(gfx::Canvas* canvas) { if (drop_hover_animation_->GetCurrentValue() > 0) { canvas->SaveLayerAlpha( static_cast<int>(drop_hover_animation_->GetCurrentValue() * 255)); - canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, - SkXfermode::kClear_Mode); + canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); PaintBitmaps(canvas, drop_down_image_set->top, drop_down_image_set->center, diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 9b4e6bf..dacb1a8 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -652,7 +652,7 @@ void OpaqueBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) { canvas->SaveLayerAlpha( 255, gfx::Rect(x - kClientEdgeThickness, y, w + kClientEdgeThickness * 3, h)); - canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); canvas->FillRect(gfx::Rect(x, bottom_y, w, bottom_edge_height), tp->GetColor(ThemeService::COLOR_TOOLBAR)); diff --git a/chrome/browser/ui/views/infobars/infobar_background.cc b/chrome/browser/ui/views/infobars/infobar_background.cc index 7078f9b..383e394 100644 --- a/chrome/browser/ui/views/infobars/infobar_background.cc +++ b/chrome/browser/ui/views/infobars/infobar_background.cc @@ -38,7 +38,7 @@ void InfoBarBackground::Paint(gfx::Canvas* canvas, views::View* view) const { gradient_shader->unref(); InfoBarView* infobar = static_cast<InfoBarView*>(view); - SkCanvas* canvas_skia = canvas->GetSkCanvas(); + SkCanvas* canvas_skia = canvas->sk_canvas(); canvas_skia->drawPath(infobar->fill_path(), paint); paint.setShader(NULL); diff --git a/chrome/browser/ui/views/infobars/translate_infobar_base.cc b/chrome/browser/ui/views/infobars/translate_infobar_base.cc index 210869d..b3f5e3a 100644 --- a/chrome/browser/ui/views/infobars/translate_infobar_base.cc +++ b/chrome/browser/ui/views/infobars/translate_infobar_base.cc @@ -129,7 +129,7 @@ void TranslateInfoBarBase::FadeBackground(gfx::Canvas* canvas, // Draw the background into an offscreen buffer with alpha value per animation // value, then blend it back into the current canvas. canvas->SaveLayerAlpha(static_cast<int>(animation_value * 255)); - canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); background.Paint(canvas, this); canvas->Restore(); } diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc index e56e40e..b6ee070 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc @@ -239,15 +239,15 @@ void ContentSettingImageView::OnPaintBackground(gfx::Canvas* canvas) { SkSafeUnref(paint.getShader()); SkRect color_rect; color_rect.iset(0, 0, width() - 1, height() - 1); - canvas->GetSkCanvas()->drawRoundRect(color_rect, kBoxCornerRadius, - kBoxCornerRadius, paint); + canvas->sk_canvas()->drawRoundRect(color_rect, kBoxCornerRadius, + kBoxCornerRadius, paint); SkPaint outer_paint; outer_paint.setStyle(SkPaint::kStroke_Style); outer_paint.setColor(kBorderColor); color_rect.inset(SkIntToScalar(kEdgeThickness), SkIntToScalar(kEdgeThickness)); - canvas->GetSkCanvas()->drawRoundRect(color_rect, kBoxCornerRadius, - kBoxCornerRadius, outer_paint); + canvas->sk_canvas()->drawRoundRect(color_rect, kBoxCornerRadius, + kBoxCornerRadius, outer_paint); } else { views::ImageView::OnPaintBackground(canvas); return; diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 2dcb8d0..9e00dad 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -60,8 +60,8 @@ #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image.h" #include "ui/gfx/skia_util.h" -#include "ui/views/controls/label.h" #include "ui/views/button_drag_utils.h" +#include "ui/views/controls/label.h" #if !defined(OS_CHROMEOS) #include "chrome/browser/ui/views/first_run_bubble.h" @@ -773,8 +773,8 @@ void LocationBarView::OnPaint(gfx::Canvas* canvas) { const SkScalar radius(SkIntToScalar( views::BubbleBorder::GetCornerRadius())); bounds.Inset(kNormalHorizontalEdgeThickness, 0); - canvas->GetSkCanvas()->drawRoundRect(gfx::RectToSkRect(bounds), radius, - radius, paint); + canvas->sk_canvas()->drawRoundRect(gfx::RectToSkRect(bounds), radius, + radius, paint); } else { canvas->FillRect(bounds, color); } diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index b2ed068..d5a3039 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -510,7 +510,7 @@ void BalloonViewImpl::OnPaint(gfx::Canvas* canvas) { SkPaint paint; paint.setAntiAlias(true); paint.setColor(kControlBarBackgroundColor); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); // Draw a 1-pixel gray line between the content and the menu bar. int line_width = GetTotalWidth() - kLeftMargin - kRightMargin; diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 0e94805..bf3f0d6 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc @@ -419,7 +419,7 @@ void StatusBubbleViews::StatusView::OnPaint(gfx::Canvas* canvas) { SkPaint shadow_paint; shadow_paint.setFlags(SkPaint::kAntiAlias_Flag); shadow_paint.setColor(kShadowColor); - canvas->GetSkCanvas()->drawPath(shadow_path, shadow_paint); + canvas->sk_canvas()->drawPath(shadow_path, shadow_paint); // Draw the bubble. rect.set(SkIntToScalar(kShadowThickness), @@ -428,7 +428,7 @@ void StatusBubbleViews::StatusView::OnPaint(gfx::Canvas* canvas) { SkIntToScalar(height - kShadowThickness)); SkPath path; path.addRoundRect(rect, rad, SkPath::kCW_Direction); - canvas->GetSkCanvas()->drawPath(path, paint); + canvas->sk_canvas()->drawPath(path, paint); // Draw highlight text and then the text body. In order to make sure the text // is aligned to the right on RTL UIs, we mirror the text bounds if the diff --git a/chrome/browser/ui/views/tabs/default_tab_drag_controller.cc b/chrome/browser/ui/views/tabs/default_tab_drag_controller.cc index a5bddf5..2d58e4e 100644 --- a/chrome/browser/ui/views/tabs/default_tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/default_tab_drag_controller.cc @@ -95,7 +95,7 @@ class DockView : public views::View { SkPaint paint; paint.setColor(SkColorSetRGB(108, 108, 108)); paint.setStyle(SkPaint::kFill_Style); - canvas->GetSkCanvas()->drawRoundRect( + canvas->sk_canvas()->drawRoundRect( outer_rect, SkIntToScalar(kRoundedRectRadius), SkIntToScalar(kRoundedRectRadius), paint); diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.cc b/chrome/browser/ui/views/tabs/dragged_tab_view.cc index aa3aec3..84ab324 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_view.cc @@ -176,7 +176,7 @@ void DraggedTabView::PaintDetachedView(gfx::Canvas* canvas) { rc.fTop = 0; rc.fRight = SkIntToScalar(ps.width()); rc.fBottom = SkIntToScalar(ps.height()); - canvas->GetSkCanvas()->drawRect(rc, paint); + canvas->sk_canvas()->drawRect(rc, paint); } void DraggedTabView::PaintFocusRect(gfx::Canvas* canvas) { diff --git a/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc b/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc index e4bbb49..32f6a67 100644 --- a/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc +++ b/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc @@ -109,7 +109,7 @@ void NativeViewPhotoboothWin::PaintScreenshotIntoCanvas( SRCCOPY); // Windows screws up the alpha channel on all text it draws, and so we need // to call makeOpaque _after_ the blit to correct for this. - skia::MakeOpaque(canvas->GetSkCanvas(), target_bounds.x(), + skia::MakeOpaque(canvas->sk_canvas(), target_bounds.x(), target_bounds.y(), target_bounds.width(), target_bounds.height()); ReleaseDC(current_hwnd_, source_dc); diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index 97aa224..a5798cb 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -370,8 +370,7 @@ void Tab::PaintTabBackground(gfx::Canvas* canvas) { if (throb_value > 0) { canvas->SaveLayerAlpha(static_cast<int>(throb_value * 0xff), gfx::Rect(width(), height())); - canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, - SkXfermode::kClear_Mode); + canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); PaintActiveTabBackground(canvas); canvas->Restore(); } diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller2.cc b/chrome/browser/ui/views/tabs/tab_drag_controller2.cc index 5255b03..9ca34ac 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller2.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller2.cc @@ -84,11 +84,11 @@ class DockView : public views::View { SkPaint paint; paint.setColor(SkColorSetRGB(108, 108, 108)); paint.setStyle(SkPaint::kFill_Style); - canvas->GetSkCanvas()->drawRoundRect( + canvas->sk_canvas()->drawRoundRect( outer_rect, SkIntToScalar(kRoundedRectRadius), SkIntToScalar(kRoundedRectRadius), paint); - ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); SkBitmap* high_icon = rb.GetBitmapNamed(IDR_DOCK_HIGH); SkBitmap* wide_icon = rb.GetBitmapNamed(IDR_DOCK_WIDE); diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc index 3967a35..10d70bf 100644 --- a/chrome/common/extensions/extension_action.cc +++ b/chrome/common/extensions/extension_action.cc @@ -159,36 +159,34 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas, rect_paint.setStyle(SkPaint::kFill_Style); rect_paint.setAntiAlias(true); rect_paint.setColor(background_color); - canvas->GetSkCanvas()->drawRoundRect(rect, SkIntToScalar(2), - SkIntToScalar(2), rect_paint); + canvas->sk_canvas()->drawRoundRect(rect, SkIntToScalar(2), + SkIntToScalar(2), rect_paint); // Overlay the gradient. It is stretchy, so we do this in three parts. - ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance(); - SkBitmap* gradient_left = resource_bundle.GetBitmapNamed( - IDR_BROWSER_ACTION_BADGE_LEFT); - SkBitmap* gradient_right = resource_bundle.GetBitmapNamed( - IDR_BROWSER_ACTION_BADGE_RIGHT); - SkBitmap* gradient_center = resource_bundle.GetBitmapNamed( + ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); + SkBitmap* gradient_left = rb.GetBitmapNamed(IDR_BROWSER_ACTION_BADGE_LEFT); + SkBitmap* gradient_right = rb.GetBitmapNamed(IDR_BROWSER_ACTION_BADGE_RIGHT); + SkBitmap* gradient_center = rb.GetBitmapNamed( IDR_BROWSER_ACTION_BADGE_CENTER); - canvas->GetSkCanvas()->drawBitmap(*gradient_left, rect.fLeft, rect.fTop); + canvas->sk_canvas()->drawBitmap(*gradient_left, rect.fLeft, rect.fTop); canvas->TileImageInt(*gradient_center, SkScalarFloor(rect.fLeft) + gradient_left->width(), SkScalarFloor(rect.fTop), SkScalarFloor(rect.width()) - gradient_left->width() - gradient_right->width(), SkScalarFloor(rect.height())); - canvas->GetSkCanvas()->drawBitmap(*gradient_right, + canvas->sk_canvas()->drawBitmap(*gradient_right, rect.fRight - SkIntToScalar(gradient_right->width()), rect.fTop); // Finally, draw the text centered within the badge. We set a clip in case the // text was too large. rect.fLeft += kPadding; rect.fRight -= kPadding; - canvas->GetSkCanvas()->clipRect(rect); - canvas->GetSkCanvas()->drawText(text.c_str(), text.size(), - rect.fLeft + (rect.width() - text_width) / 2, - rect.fTop + kTextSize + kTopTextPadding, - *text_paint); + canvas->sk_canvas()->clipRect(rect); + canvas->sk_canvas()->drawText(text.c_str(), text.size(), + rect.fLeft + (rect.width() - text_width) / 2, + rect.fTop + kTextSize + kTopTextPadding, + *text_paint); canvas->Restore(); } diff --git a/content/browser/renderer_host/backing_store_skia.cc b/content/browser/renderer_host/backing_store_skia.cc index cb76b7b..32c868b 100644 --- a/content/browser/renderer_host/backing_store_skia.cc +++ b/content/browser/renderer_host/backing_store_skia.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -31,7 +31,7 @@ BackingStoreSkia::~BackingStoreSkia() { void BackingStoreSkia::SkiaShowRect(const gfx::Point& point, gfx::Canvas* canvas) { - canvas->GetSkCanvas()->drawBitmap(bitmap_, + canvas->sk_canvas()->drawBitmap(bitmap_, SkIntToScalar(point.x()), SkIntToScalar(point.y())); } diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index e6c96ff..cad1072 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -339,7 +339,7 @@ void RenderWidgetHostViewAura::DidUpdateBackingStore( gfx::Rect clip_rect; if (paint_canvas_) { SkRect sk_clip_rect; - if (paint_canvas_->GetSkCanvas()->getClipBounds(&sk_clip_rect)) + if (paint_canvas_->sk_canvas()->getClipBounds(&sk_clip_rect)) clip_rect = gfx::SkRectToRect(sk_clip_rect); } diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index fff1281..89bb411 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -10,11 +10,11 @@ #include "third_party/skia/include/core/SkXfermode.h" #include "ui/aura/client/stacking_client.h" #include "ui/aura/event.h" +#include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/aura/root_window.h" #include "ui/base/ui_base_paths.h" #include "ui/gfx/canvas.h" #include "ui/gfx/compositor/test/compositor_test_support.h" @@ -60,7 +60,7 @@ class DemoWindowDelegate : public aura::WindowDelegate { virtual bool CanFocus() OVERRIDE { return true; } virtual void OnCaptureLost() OVERRIDE {} virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { - canvas->GetSkCanvas()->drawColor(color_, SkXfermode::kSrc_Mode); + canvas->sk_canvas()->drawColor(color_, SkXfermode::kSrc_Mode); } virtual void OnWindowDestroying() OVERRIDE {} virtual void OnWindowDestroyed() OVERRIDE {} diff --git a/ui/aura/test/test_window_delegate.cc b/ui/aura/test/test_window_delegate.cc index d1c83677..128fa20 100644 --- a/ui/aura/test/test_window_delegate.cc +++ b/ui/aura/test/test_window_delegate.cc @@ -98,7 +98,7 @@ void ColorTestWindowDelegate::OnWindowDestroyed() { delete this; } void ColorTestWindowDelegate::OnPaint(gfx::Canvas* canvas) { - canvas->GetSkCanvas()->drawColor(color_, SkXfermode::kSrc_Mode); + canvas->sk_canvas()->drawColor(color_, SkXfermode::kSrc_Mode); } } // namespace test diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc index 4de6633..71c7de0 100644 --- a/ui/gfx/canvas_skia.cc +++ b/ui/gfx/canvas_skia.cc @@ -11,9 +11,9 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/gfx/brush.h" +#include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/rect.h" -#include "ui/gfx/canvas.h" #include "ui/gfx/skia_util.h" #include "ui/gfx/transform.h" @@ -370,14 +370,6 @@ void CanvasSkia::Transform(const ui::Transform& transform) { canvas_->concat(transform.matrix()); } -SkCanvas* CanvasSkia::GetSkCanvas() { - return canvas_; -} - -const SkCanvas* CanvasSkia::GetSkCanvas() const { - return canvas_; -} - //////////////////////////////////////////////////////////////////////////////// // CanvasSkia, private: diff --git a/ui/gfx/canvas_skia.h b/ui/gfx/canvas_skia.h index 6cf639b..bb9abf7 100644 --- a/ui/gfx/canvas_skia.h +++ b/ui/gfx/canvas_skia.h @@ -298,12 +298,8 @@ class UI_EXPORT CanvasSkia { const gfx::Rect& display_rect); #endif - // TODO(tfarina): Remove these. And stick with sk_canvas() only. - SkCanvas* GetSkCanvas(); - const SkCanvas* GetSkCanvas() const; - SkCanvas* sk_canvas() const { return canvas_; } - skia::PlatformCanvas* platform_canvas() const { return owned_canvas_.get(); } + SkCanvas* sk_canvas() const { return canvas_; } private: // Test whether the provided rectangle intersects the current clip rect. diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc index 3e9783e..17df962 100644 --- a/ui/gfx/compositor/layer_unittest.cc +++ b/ui/gfx/compositor/layer_unittest.cc @@ -127,7 +127,7 @@ class ColoredLayer : public Layer, public LayerDelegate { // Overridden from LayerDelegate: virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE { - canvas->GetSkCanvas()->drawColor(color_); + canvas->sk_canvas()->drawColor(color_); } private: @@ -963,7 +963,7 @@ class SchedulePaintLayerDelegate : public LayerDelegate { schedule_paint_rect_ = gfx::Rect(); } SkRect sk_clip_rect; - if (canvas->GetSkCanvas()->getClipBounds(&sk_clip_rect)) + if (canvas->sk_canvas()->getClipBounds(&sk_clip_rect)) last_clip_rect_ = gfx::SkRectToRect(sk_clip_rect); } diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index cf209d6..ceefc05 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc @@ -172,7 +172,7 @@ namespace gfx { namespace internal { SkiaTextRenderer::SkiaTextRenderer(Canvas* canvas) - : canvas_skia_(canvas->GetSkCanvas()) { + : canvas_skia_(canvas->sk_canvas()) { DCHECK(canvas_skia_); paint_.setTextEncoding(SkPaint::kGlyphID_TextEncoding); paint_.setStyle(SkPaint::kFill_Style); 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_, |