diff options
Diffstat (limited to 'chrome')
35 files changed, 109 insertions, 99 deletions
diff --git a/chrome/browser/chromeos/frame/bubble_frame_view.cc b/chrome/browser/chromeos/frame/bubble_frame_view.cc index e864b80..9b77a43 100644 --- a/chrome/browser/chromeos/frame/bubble_frame_view.cc +++ b/chrome/browser/chromeos/frame/bubble_frame_view.cc @@ -215,7 +215,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->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->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 a81beff..9f9731e 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -131,7 +131,7 @@ class TitleBackgroundPainter : public views::Painter { paint.setShader(s); // Need to unref shader, otherwise never deleted. s->unref(); - canvas->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->drawPath(path, paint); } PanelController* panel_controller_; diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc index f561899..4333af3 100644 --- a/chrome/browser/chromeos/login/helper.cc +++ b/chrome/browser/chromeos/login/helper.cc @@ -62,7 +62,7 @@ class BackgroundPainter : public views::Painter { NULL); paint.setShader(s); s->unref(); - canvas->AsCanvasSkia()->drawRect(rect, paint); + canvas->GetSkCanvas()->drawRect(rect, paint); } private: diff --git a/chrome/browser/chromeos/login/rounded_rect_painter.cc b/chrome/browser/chromeos/login/rounded_rect_painter.cc index 883f1a7..cb2d4b7 100644 --- a/chrome/browser/chromeos/login/rounded_rect_painter.cc +++ b/chrome/browser/chromeos/login/rounded_rect_painter.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -53,7 +53,7 @@ static void DrawRoundedRect( } else { paint.setColor(top_color); } - canvas->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->drawPath(path, paint); if (stroke_color != 0) { // Expand rect by 0.5px so resulting stroke will take the whole pixel. @@ -66,7 +66,7 @@ static void DrawRoundedRect( paint.setStyle(SkPaint::kStroke_Style); paint.setStrokeWidth(SkIntToScalar(SK_Scalar1)); paint.setColor(stroke_color); - canvas->AsCanvasSkia()->drawRoundRect( + canvas->GetSkCanvas()->drawRoundRect( rect, SkIntToScalar(corner_radius), SkIntToScalar(corner_radius), paint); @@ -91,7 +91,7 @@ static void DrawRoundedRectShadow( rect.set( SkIntToScalar(x + shadow / 2), SkIntToScalar(y + shadow / 2), SkIntToScalar(x + w - shadow / 2), SkIntToScalar(y + h - shadow / 2)); - canvas->AsCanvasSkia()->drawRoundRect( + canvas->GetSkCanvas()->drawRoundRect( rect, SkIntToScalar(corner_radius), SkIntToScalar(corner_radius), paint); @@ -112,7 +112,7 @@ static void DrawRectWithBorder(int w, if (padding > 0) { SkPaint paint; paint.setColor(padding_color); - canvas->AsCanvasSkia()->drawRectCoords( + canvas->GetSkCanvas()->drawRectCoords( SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(w), SkIntToScalar(h), paint); } @@ -207,12 +207,12 @@ class RoundedBackground : public views::Background { paint.setStyle(SkPaint::kFill_Style); paint.setFlags(SkPaint::kAntiAlias_Flag); paint.setColor(get_color()); - canvas->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->drawPath(path, paint); // Redraw boundary region with correspoinding color. paint.setStyle(SkPaint::kStroke_Style); paint.setStrokeWidth(SkIntToScalar(stroke_width_)); paint.setColor(stroke_color_); - canvas->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->drawPath(path, paint); } private: diff --git a/chrome/browser/chromeos/login/rounded_view.h b/chrome/browser/chromeos/login/rounded_view.h index c1080d7..3be2f91 100644 --- a/chrome/browser/chromeos/login/rounded_view.h +++ b/chrome/browser/chromeos/login/rounded_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -61,7 +61,7 @@ template <typename C> void RoundedView<C>::Paint(gfx::Canvas* canvas) { // Setup clip region. canvas->Save(); - canvas->AsCanvasSkia()->clipPath(GetClipPath()); + canvas->GetSkCanvas()->clipPath(GetClipPath()); // Do original painting. C::Paint(canvas); canvas->Restore(); @@ -112,7 +112,7 @@ void RoundedView<C>::DrawFrame(gfx::Canvas* canvas) { view_rect.fTop -= kOriginShift; view_rect.inset(rounded_view::kStrokeWidth, rounded_view::kStrokeWidth); paint.setColor(rounded_view::kInnerFrameColor); - canvas->AsCanvasSkia()-> + canvas->GetSkCanvas()-> drawRoundRect(view_rect, rounded_view::kCornerRadius - rounded_view::kStrokeWidth, rounded_view::kCornerRadius - rounded_view::kStrokeWidth, @@ -124,7 +124,7 @@ void RoundedView<C>::DrawFrame(gfx::Canvas* canvas) { view_rect.offset(rounded_view::kStrokeWidth - kDelta, rounded_view::kStrokeWidth - kDelta); paint.setColor(rounded_view::kOuterFrameColor); - canvas->AsCanvasSkia()->drawRoundRect(view_rect, rounded_view::kCornerRadius, + canvas->GetSkCanvas()->drawRoundRect(view_rect, rounded_view::kCornerRadius, rounded_view::kCornerRadius, paint); } diff --git a/chrome/browser/chromeos/login/user_view.cc b/chrome/browser/chromeos/login/user_view.cc index 8cca3fe..20d6313 100644 --- a/chrome/browser/chromeos/login/user_view.cc +++ b/chrome/browser/chromeos/login/user_view.cc @@ -52,7 +52,7 @@ class SignoutBackgroundPainter : public views::Painter { paint.setStyle(SkPaint::kFill_Style); paint.setFlags(SkPaint::kAntiAlias_Flag); paint.setColor(kSignoutBackgroundColor); - canvas->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->drawPath(path, paint); } }; diff --git a/chrome/browser/chromeos/login/username_view.cc b/chrome/browser/chromeos/login/username_view.cc index 34f657e..c2aa423 100644 --- a/chrome/browser/chromeos/login/username_view.cc +++ b/chrome/browser/chromeos/login/username_view.cc @@ -63,7 +63,7 @@ void UsernameView::PaintUsername(const gfx::Rect& bounds) { margin_width_ = bounds.height() * kMarginRatio; gfx::CanvasSkia canvas(bounds.width(), bounds.height(), false); // Draw transparent background. - canvas.drawColor(0); + canvas.sk_canvas()->drawColor(0); // Calculate needed space. int flags = gfx::Canvas::TEXT_ALIGN_LEFT | @@ -108,7 +108,7 @@ void UsernameView::PaintUsername(const gfx::Rect& bounds) { SkPaint paint; paint.setShader(composite_shader)->unref(); - canvas.drawPaint(paint); + canvas.sk_canvas()->drawPaint(paint); } // Draw the text. @@ -124,7 +124,7 @@ void UsernameView::PaintUsername(const gfx::Rect& bounds) { if (use_fading_for_text) { // Fade out only the text in the end. Use regular background. - canvas.drawColor(kLabelBackgoundColor, SkXfermode::kSrc_Mode); + canvas.sk_canvas()->drawColor(kLabelBackgoundColor, SkXfermode::kSrc_Mode); SkShader* image_shader = SkShader::CreateBitmapShader( *text_image_, SkShader::kRepeat_TileMode, @@ -137,7 +137,7 @@ void UsernameView::PaintUsername(const gfx::Rect& bounds) { SkPaint paint; paint.setShader(composite_shader)->unref(); - canvas.drawPaint(paint); + canvas.sk_canvas()->drawPaint(paint); text_image_.reset(new SkBitmap(canvas.ExtractBitmap())); } } diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 1674371..f0db7f2 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -261,7 +261,7 @@ void PaintDownloadProgress(gfx::Canvas* canvas, foreground_paint.setShader(shader); foreground_paint.setAntiAlias(true); shader->unref(); - canvas->AsCanvasSkia()->drawPath(path, foreground_paint); + canvas->GetSkCanvas()->drawPath(path, foreground_paint); return; } @@ -301,7 +301,7 @@ void PaintDownloadComplete(gfx::Canvas* canvas, PI/2) / 2 + 0.5; canvas->SaveLayerAlpha(static_cast<int>(255.0 * opacity), complete_bounds); - canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); canvas->DrawBitmapInt(*complete, complete_bounds.x(), complete_bounds.y()); canvas->Restore(); } @@ -337,7 +337,7 @@ void PaintDownloadInterrupted(gfx::Canvas* canvas, 0.5; canvas->SaveLayerAlpha(static_cast<int>(255.0 * opacity), complete_bounds); - canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); canvas->DrawBitmapInt(*complete, complete_bounds.x(), complete_bounds.y()); canvas->Restore(); } diff --git a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc index f7a4780..1eb46b8 100644 --- a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc +++ b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc @@ -221,7 +221,8 @@ TEST_F(ThumbnailGeneratorSimpleTest, CalculateBoringScore_SingleColor) { // Fill all pixesl in black. canvas.FillRectInt(kBlack, 0, 0, kSize.width(), kSize.height()); - SkBitmap bitmap = skia::GetTopDevice(canvas)->accessBitmap(false); + SkBitmap bitmap = + skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false); // The thumbnail should deserve the highest boring score. EXPECT_DOUBLE_EQ(1.0, ThumbnailGenerator::CalculateBoringScore(&bitmap)); } @@ -237,7 +238,8 @@ TEST_F(ThumbnailGeneratorSimpleTest, CalculateBoringScore_TwoColors) { // Fill the left half pixels in white. canvas.FillRectInt(kWhite, 0, 0, kSize.width() / 2, kSize.height()); - SkBitmap bitmap = skia::GetTopDevice(canvas)->accessBitmap(false); + SkBitmap bitmap = + skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false); ASSERT_EQ(kSize.width(), bitmap.width()); ASSERT_EQ(kSize.height(), bitmap.height()); // The thumbnail should be less boring because two colors are used. @@ -247,7 +249,8 @@ TEST_F(ThumbnailGeneratorSimpleTest, CalculateBoringScore_TwoColors) { TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_TallerThanWide) { // The input bitmap is vertically long. gfx::CanvasSkia canvas(40, 90, true); - const SkBitmap bitmap = skia::GetTopDevice(canvas)->accessBitmap(false); + SkBitmap bitmap = + skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false); // The desired size is square. ThumbnailGenerator::ClipResult clip_result = ThumbnailGenerator::kNotClipped; @@ -263,7 +266,8 @@ TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_TallerThanWide) { TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_WiderThanTall) { // The input bitmap is horizontally long. gfx::CanvasSkia canvas(90, 40, true); - const SkBitmap bitmap = skia::GetTopDevice(canvas)->accessBitmap(false); + SkBitmap bitmap = + skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false); // The desired size is square. ThumbnailGenerator::ClipResult clip_result = ThumbnailGenerator::kNotClipped; @@ -279,7 +283,8 @@ TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_WiderThanTall) { TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_NotClipped) { // The input bitmap is square. gfx::CanvasSkia canvas(40, 40, true); - const SkBitmap bitmap = skia::GetTopDevice(canvas)->accessBitmap(false); + SkBitmap bitmap = + skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false); // The desired size is square. ThumbnailGenerator::ClipResult clip_result = ThumbnailGenerator::kNotClipped; @@ -295,7 +300,8 @@ TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_NotClipped) { TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_NonSquareOutput) { // The input bitmap is square. gfx::CanvasSkia canvas(40, 40, true); - const SkBitmap bitmap = skia::GetTopDevice(canvas)->accessBitmap(false); + SkBitmap bitmap = + skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false); // The desired size is horizontally long. ThumbnailGenerator::ClipResult clip_result = ThumbnailGenerator::kNotClipped; diff --git a/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc b/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc index e42a03d..422db16 100644 --- a/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc @@ -178,7 +178,7 @@ void InfoBarContainerGtk::PaintArrowOn(GtkWidget* widget, paint.setShader(gradient_shader); gradient_shader->unref(); - gfx::CanvasSkiaPaint canvas(expose, false); + skia::PlatformCanvasPaint canvas(expose, false); canvas.drawPath(path, paint); paint.setShader(NULL); diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc index ef9b27e..1d416dc 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc @@ -419,15 +419,16 @@ void TabRendererGtk::PaintFaviconArea(GdkEventExpose* event) { SkRect bounds; bounds.set(favicon_bounds_.x(), favicon_bounds_.y(), favicon_bounds_.right(), favicon_bounds_.bottom()); - canvas.saveLayerAlpha(&bounds, static_cast<int>(throb_value * 0xff), - SkCanvas::kARGB_ClipLayer_SaveFlag); - canvas.drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas.sk_canvas()->saveLayerAlpha( + &bounds, static_cast<int>(throb_value * 0xff), + SkCanvas::kARGB_ClipLayer_SaveFlag); + canvas.sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); SkBitmap* active_bg = theme_service_->GetBitmapNamed(IDR_THEME_TOOLBAR); canvas.TileImageInt(*active_bg, x() + favicon_bounds_.x(), favicon_bounds_.y(), favicon_bounds_.x(), favicon_bounds_.y(), favicon_bounds_.width(), favicon_bounds_.height()); - canvas.restore(); + canvas.sk_canvas()->restore(); } } @@ -655,7 +656,7 @@ cairo_surface_t* TabRendererGtk::PaintToSurface() { gfx::CanvasSkia canvas(width(), height(), false); Paint(&canvas); return cairo_surface_reference(cairo_get_target( - skia::BeginPlatformPaint(&canvas))); + skia::BeginPlatformPaint(canvas.sk_canvas()))); } void TabRendererGtk::SchedulePaint() { @@ -887,8 +888,8 @@ void TabRendererGtk::PaintTabBackground(gfx::Canvas* canvas) { if (throb_value > 0) { canvas->SaveLayerAlpha(static_cast<int>(throb_value * 0xff), gfx::Rect(width(), height())); - canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, - SkXfermode::kClear_Mode); + canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, + SkXfermode::kClear_Mode); PaintActiveTabBackground(canvas); canvas->Restore(); } diff --git a/chrome/browser/ui/views/aura/aura_init.cc b/chrome/browser/ui/views/aura/aura_init.cc index ce8064a..d5cf9df 100644 --- a/chrome/browser/ui/views/aura/aura_init.cc +++ b/chrome/browser/ui/views/aura/aura_init.cc @@ -48,7 +48,7 @@ class DemoWindowDelegate : public aura::WindowDelegate { virtual void OnCaptureLost() OVERRIDE { } virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { - canvas->AsCanvasSkia()->drawColor(color_, SkXfermode::kSrc_Mode); + canvas->GetSkCanvas()->drawColor(color_, SkXfermode::kSrc_Mode); } virtual void OnWindowDestroying() OVERRIDE { } 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 35bb187..5b7238a 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -520,7 +520,7 @@ void AutocompletePopupContentsView::OnMouseExited( // AutocompletePopupContentsView, protected: void AutocompletePopupContentsView::PaintResultViews(gfx::CanvasSkia* canvas) { - canvas->drawColor(AutocompleteResultView::GetColor( + canvas->sk_canvas()->drawColor(AutocompleteResultView::GetColor( AutocompleteResultView::NORMAL, AutocompleteResultView::BACKGROUND)); View::PaintChildren(canvas); } @@ -570,7 +570,7 @@ void AutocompletePopupContentsView::OnPaint(gfx::Canvas* canvas) { paint.setAntiAlias(true); SkShader* shader = SkShader::CreateBitmapShader( - contents_canvas.getDevice()->accessBitmap(false), + contents_canvas.sk_canvas()->getDevice()->accessBitmap(false), SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); paint.setShader(shader); @@ -578,7 +578,7 @@ void AutocompletePopupContentsView::OnPaint(gfx::Canvas* canvas) { gfx::Path path; MakeContentsPath(&path, GetContentsBounds()); - canvas->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->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 @@ -644,7 +644,7 @@ void AutocompletePopupContentsView::MakeCanvasTransparent( // Allow the window blur effect to show through the popup background. SkAlpha alpha = GetThemeProvider()->ShouldUseNativeFrame() ? kGlassPopupAlpha : kOpaquePopupAlpha; - canvas->AsCanvasSkia()->drawColor(SkColorSetA( + canvas->GetSkCanvas()->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 01d0997..55d3e5b 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc @@ -522,7 +522,7 @@ void AutocompleteResultView::Layout() { void AutocompleteResultView::OnPaint(gfx::Canvas* canvas) { const ResultViewState state = GetState(); if (state != NORMAL) - canvas->AsCanvasSkia()->drawColor(GetColor(state, BACKGROUND)); + canvas->GetSkCanvas()->drawColor(GetColor(state, BACKGROUND)); // Paint the icon. canvas->DrawBitmapInt(*GetIcon(), GetMirroredXForRect(icon_bounds_), diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 9c6c252..cc345a0 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -176,7 +176,7 @@ void AppInfoView::OnPaint(gfx::Canvas* canvas) { border_paint.setAntiAlias(true); border_paint.setARGB(0xFF, 0xC8, 0xC8, 0xC8); - canvas->AsCanvasSkia()->drawRoundRect( + canvas->GetSkCanvas()->drawRoundRect( border_rect, SkIntToScalar(2), SkIntToScalar(2), border_paint); SkRect inner_rect = { @@ -189,7 +189,7 @@ void AppInfoView::OnPaint(gfx::Canvas* canvas) { SkPaint inner_paint; inner_paint.setAntiAlias(true); inner_paint.setARGB(0xFF, 0xF8, 0xF8, 0xF8); - canvas->AsCanvasSkia()->drawRoundRect( + canvas->GetSkCanvas()->drawRoundRect( inner_rect, SkDoubleToScalar(1.5), SkDoubleToScalar(1.5), inner_paint); } diff --git a/chrome/browser/ui/views/detachable_toolbar_view.cc b/chrome/browser/ui/views/detachable_toolbar_view.cc index 04aa0d5..60c09e0 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->AsCanvasSkia()->drawRoundRect( + canvas->GetSkCanvas()->drawRoundRect( rect, SkDoubleToScalar(roundness), SkDoubleToScalar(roundness), paint); } @@ -85,7 +85,7 @@ void DetachableToolbarView::PaintContentAreaBorder( border_paint.setAlpha(96); border_paint.setAntiAlias(true); - canvas->AsCanvasSkia()->drawRoundRect( + canvas->GetSkCanvas()->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->AsCanvasSkia()->drawRect(rc, paint); + canvas->GetSkCanvas()->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->AsCanvasSkia()->drawRect(rc_down, paint_down); + canvas->GetSkCanvas()->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 33951dd..b7ffde5 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -773,7 +773,7 @@ void DownloadItemView::OnPaint(gfx::Canvas* canvas) { if (body_hover_animation_->GetCurrentValue() > 0) { canvas->SaveLayerAlpha( static_cast<int>(body_hover_animation_->GetCurrentValue() * 255)); - canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); int x = kLeftPadding; PaintBitmaps(canvas, @@ -807,8 +807,8 @@ void DownloadItemView::OnPaint(gfx::Canvas* canvas) { if (drop_hover_animation_->GetCurrentValue() > 0) { canvas->SaveLayerAlpha( static_cast<int>(drop_hover_animation_->GetCurrentValue() * 255)); - canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, - SkXfermode::kClear_Mode); + canvas->GetSkCanvas()->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 100b5fa..14e1d47 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -802,7 +802,7 @@ void OpaqueBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) { canvas->SaveLayerAlpha( 255, gfx::Rect(x - kClientEdgeThickness, y, w + kClientEdgeThickness * 3, h)); - canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); SkColor theme_toolbar_color = tp->GetColor(ThemeService::COLOR_TOOLBAR); diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index 2716050..06051ddc6 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -96,7 +96,7 @@ void FullscreenExitBubbleViews::FullscreenExitView::OnPaint( paint.setStyle(SkPaint::kFill_Style); paint.setFlags(SkPaint::kAntiAlias_Flag); paint.setColor(SK_ColorBLACK); - canvas->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->drawPath(path, paint); } // FullscreenExitBubbleViews --------------------------------------------------- diff --git a/chrome/browser/ui/views/infobars/infobar_background.cc b/chrome/browser/ui/views/infobars/infobar_background.cc index e28e1ac..5822faa 100644 --- a/chrome/browser/ui/views/infobars/infobar_background.cc +++ b/chrome/browser/ui/views/infobars/infobar_background.cc @@ -39,7 +39,7 @@ void InfoBarBackground::Paint(gfx::Canvas* canvas, views::View* view) const { gradient_shader->unref(); InfoBarView* infobar = static_cast<InfoBarView*>(view); - gfx::CanvasSkia* canvas_skia = canvas->AsCanvasSkia(); + SkCanvas* canvas_skia = canvas->GetSkCanvas(); 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 c47ea3c..0e5b896 100644 --- a/chrome/browser/ui/views/infobars/translate_infobar_base.cc +++ b/chrome/browser/ui/views/infobars/translate_infobar_base.cc @@ -130,7 +130,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->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); + canvas->GetSkCanvas()->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 4eca62a..11c1835 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 @@ -202,15 +202,15 @@ void ContentSettingImageView::OnPaintBackground(gfx::Canvas* canvas) { SkSafeUnref(paint.getShader()); SkRect color_rect; color_rect.iset(0, 0, width() - 1, height() - 1); - canvas->AsCanvasSkia()->drawRoundRect(color_rect, kBoxCornerRadius, - kBoxCornerRadius, paint); + canvas->GetSkCanvas()->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->AsCanvasSkia()->drawRoundRect(color_rect, kBoxCornerRadius, - kBoxCornerRadius, outer_paint); + canvas->GetSkCanvas()->drawRoundRect(color_rect, kBoxCornerRadius, + kBoxCornerRadius, outer_paint); } void ContentSettingImageView::BubbleClosing(Bubble* bubble, 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 66fefaa..9eba4ae 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -744,8 +744,8 @@ void LocationBarView::OnPaint(gfx::Canvas* canvas) { const SkScalar radius(SkIntToScalar( views::BubbleBorder::GetCornerRadius())); bounds.Inset(kNormalHorizontalEdgeThickness, 0); - canvas->AsCanvasSkia()->drawRoundRect(gfx::RectToSkRect(bounds), radius, - radius, paint); + canvas->GetSkCanvas()->drawRoundRect(gfx::RectToSkRect(bounds), radius, + radius, paint); } else { canvas->FillRectInt(color, bounds.x(), bounds.y(), bounds.width(), bounds.height()); diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index 62f3f31..d9ee107 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -476,7 +476,7 @@ void BalloonViewImpl::OnPaint(gfx::Canvas* canvas) { SkPaint paint; paint.setAntiAlias(true); paint.setColor(kControlBarBackgroundColor); - canvas->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->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/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index e5503dc..3f3777b 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -2275,7 +2275,8 @@ void OmniboxViewWin::DrawSlashForInsecureScheme(HDC hdc, // it to fully transparent so any antialiasing will look nice when painted // atop the edit. gfx::CanvasSkia canvas(scheme_rect.Width(), scheme_rect.Height(), false); - canvas.getDevice()->accessBitmap(true).eraseARGB(0, 0, 0, 0); + SkCanvas* sk_canvas = canvas.sk_canvas(); + sk_canvas->getDevice()->accessBitmap(true).eraseARGB(0, 0, 0, 0); // Calculate the start and end of the stroke, which are just the lower left // and upper right corners of the canvas, inset by the radius of the endcap @@ -2299,26 +2300,26 @@ void OmniboxViewWin::DrawSlashForInsecureScheme(HDC hdc, SkIntToScalar(scheme_rect.Height()) }; // Draw the unselected portion of the stroke. - canvas.save(); + sk_canvas->save(); if (selection_rect.isEmpty() || - canvas.clipRect(selection_rect, SkRegion::kDifference_Op)) { + sk_canvas->clipRect(selection_rect, SkRegion::kDifference_Op)) { paint.setColor(LocationBarView::GetColor(security_level_, LocationBarView::SECURITY_TEXT)); - canvas.drawLine(start_point.fX, start_point.fY, - end_point.fX, end_point.fY, paint); + sk_canvas->drawLine(start_point.fX, start_point.fY, + end_point.fX, end_point.fY, paint); } - canvas.restore(); + sk_canvas->restore(); // Draw the selected portion of the stroke. - if (!selection_rect.isEmpty() && canvas.clipRect(selection_rect)) { + if (!selection_rect.isEmpty() && sk_canvas->clipRect(selection_rect)) { paint.setColor(LocationBarView::GetColor(security_level_, LocationBarView::SELECTED_TEXT)); - canvas.drawLine(start_point.fX, start_point.fY, - end_point.fX, end_point.fY, paint); + sk_canvas->drawLine(start_point.fX, start_point.fY, + end_point.fX, end_point.fY, paint); } // Now copy what we drew to the target HDC. - skia::DrawToNativeContext(&canvas, hdc, + skia::DrawToNativeContext(sk_canvas, hdc, scheme_rect.left + canvas_paint_clip_rect.left - canvas_clip_rect.left, std::max(scheme_rect.top, client_rect.top) + canvas_paint_clip_rect.top - canvas_clip_rect.top, &canvas_paint_clip_rect); diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 3ed7dc2..6940c8f 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc @@ -412,7 +412,7 @@ void StatusBubbleViews::StatusView::OnPaint(gfx::Canvas* canvas) { SkPaint shadow_paint; shadow_paint.setFlags(SkPaint::kAntiAlias_Flag); shadow_paint.setColor(kShadowColor); - canvas->AsCanvasSkia()->drawPath(shadow_path, shadow_paint); + canvas->GetSkCanvas()->drawPath(shadow_path, shadow_paint); // Draw the bubble. rect.set(SkIntToScalar(kShadowThickness), @@ -421,7 +421,7 @@ void StatusBubbleViews::StatusView::OnPaint(gfx::Canvas* canvas) { SkIntToScalar(height - kShadowThickness)); SkPath path; path.addRoundRect(rect, rad, SkPath::kCW_Direction); - canvas->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->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/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index 00d9a5c..96352684 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -84,7 +84,7 @@ class DockView : public views::View { SkPaint paint; paint.setColor(SkColorSetRGB(108, 108, 108)); paint.setStyle(SkPaint::kFill_Style); - canvas->AsCanvasSkia()->drawRoundRect( + canvas->GetSkCanvas()->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 4958632..995a061 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_view.cc @@ -137,7 +137,7 @@ void DraggedTabView::PaintDetachedView(gfx::Canvas* canvas) { gfx::Size ps = GetPreferredSize(); gfx::CanvasSkia scale_canvas(ps.width(), ps.height(), false); SkBitmap& bitmap_device = const_cast<SkBitmap&>( - skia::GetTopDevice(scale_canvas)->accessBitmap(true)); + skia::GetTopDevice(*scale_canvas.sk_canvas())->accessBitmap(true)); bitmap_device.eraseARGB(0, 0, 0, 0); int tab_height = renderer_bounds_.back().height(); @@ -178,7 +178,7 @@ void DraggedTabView::PaintDetachedView(gfx::Canvas* canvas) { rc.fTop = 0; rc.fRight = SkIntToScalar(ps.width()); rc.fBottom = SkIntToScalar(ps.height()); - canvas->AsCanvasSkia()->drawRect(rc, paint); + canvas->GetSkCanvas()->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 c545d44..550acb8 100644 --- a/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc +++ b/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc @@ -110,7 +110,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->AsCanvasSkia(), target_bounds.x(), + skia::MakeOpaque(canvas->GetSkCanvas(), 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/side_tab.cc b/chrome/browser/ui/views/tabs/side_tab.cc index dd1213a..335d8a9 100644 --- a/chrome/browser/ui/views/tabs/side_tab.cc +++ b/chrome/browser/ui/views/tabs/side_tab.cc @@ -85,10 +85,10 @@ void SideTab::OnPaint(gfx::Canvas* canvas) { paint.setAntiAlias(true); SkRect border_rect = { SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(width()), SkIntToScalar(height()) }; - canvas->AsCanvasSkia()->drawRoundRect(border_rect, - SkIntToScalar(kRoundRectRadius), - SkIntToScalar(kRoundRectRadius), - paint); + canvas->GetSkCanvas()->drawRoundRect(border_rect, + SkIntToScalar(kRoundRectRadius), + SkIntToScalar(kRoundRectRadius), + paint); } if (ShouldShowIcon()) diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index 5bd6fef..4ab41fe 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -359,8 +359,8 @@ void Tab::PaintTabBackground(gfx::Canvas* canvas) { if (throb_value > 0) { canvas->SaveLayerAlpha(static_cast<int>(throb_value * 0xff), gfx::Rect(width(), height())); - canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, - SkXfermode::kClear_Mode); + canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, + SkXfermode::kClear_Mode); PaintActiveTabBackground(canvas); canvas->Restore(); } diff --git a/chrome/browser/ui/views/theme_helpers.cc b/chrome/browser/ui/views/theme_helpers.cc index 1708049..e81d875 100644 --- a/chrome/browser/ui/views/theme_helpers.cc +++ b/chrome/browser/ui/views/theme_helpers.cc @@ -31,7 +31,7 @@ void GetRebarGradientColors(int width, int x1, int x2, // On Windows XP+, if using a Theme, we can ask the theme to render the // gradient for us. if (!theme.IsThemeNull()) { - skia::ScopedPlatformPaint scoped_platform_paint(&canvas); + skia::ScopedPlatformPaint scoped_platform_paint(canvas.sk_canvas()); HDC dc = scoped_platform_paint.GetPlatformSurface(); RECT rect = { 0, 0, width, 1 }; theme.DrawThemeBackground(dc, 0, 0, &rect, NULL); @@ -56,14 +56,15 @@ void GetRebarGradientColors(int width, int x1, int x2, // the gradient. gradient_shader->unref(); paint.setStyle(SkPaint::kFill_Style); - canvas.drawRectCoords(SkIntToScalar(0), SkIntToScalar(0), - SkIntToScalar(width), SkIntToScalar(1), paint); + canvas.sk_canvas()->drawRectCoords( + SkIntToScalar(0), SkIntToScalar(0), + SkIntToScalar(width), SkIntToScalar(1), paint); } // Extract the color values from the selected pixels // The | in the following operations forces the alpha to 0xFF. This is // needed as windows sets the alpha to 0 when it renders. - SkDevice* device = skia::GetTopDevice(canvas); + SkDevice* device = skia::GetTopDevice(*canvas.sk_canvas()); const SkBitmap& bitmap = device->accessBitmap(false); SkAutoLockPixels lock(bitmap); diff --git a/chrome/browser/ui/views/theme_install_bubble_view.cc b/chrome/browser/ui/views/theme_install_bubble_view.cc index 67c26f7..79c52e3 100644 --- a/chrome/browser/ui/views/theme_install_bubble_view.cc +++ b/chrome/browser/ui/views/theme_install_bubble_view.cc @@ -129,7 +129,7 @@ void ThemeInstallBubbleView::OnPaint(gfx::Canvas* canvas) { SkIntToScalar(height())); SkPath path; path.addRoundRect(rect, rad, SkPath::kCW_Direction); - canvas->AsCanvasSkia()->drawPath(path, paint); + canvas->GetSkCanvas()->drawPath(path, paint); int text_width = views::Label::font().GetStringWidth(text_); gfx::Rect body_bounds(kTextHorizPadding / 2, 0, text_width, height()); diff --git a/chrome/common/badge_util.cc b/chrome/common/badge_util.cc index 4649726..3175de8 100644 --- a/chrome/common/badge_util.cc +++ b/chrome/common/badge_util.cc @@ -92,7 +92,8 @@ SkBitmap DrawBadgeIconOverlay(const SkBitmap& icon, // add 'font_size - 1' to the height. SkScalar x = (badge_width - text_width)/2; SkScalar y = (icon.height() - font_size)/2 + font_size - 1; - canvas->drawText(badge_text.c_str(), badge_text.size(), x, y, *paint); + canvas->sk_canvas()->drawText( + badge_text.c_str(), badge_text.size(), x, y, *paint); // Return the generated image. return canvas->ExtractBitmap(); diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc index d9afab8..284da0e 100644 --- a/chrome/common/extensions/extension_action.cc +++ b/chrome/common/extensions/extension_action.cc @@ -159,8 +159,8 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas, rect_paint.setStyle(SkPaint::kFill_Style); rect_paint.setAntiAlias(true); rect_paint.setColor(background_color); - canvas->AsCanvasSkia()->drawRoundRect(rect, SkIntToScalar(2), - SkIntToScalar(2), rect_paint); + canvas->GetSkCanvas()->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(); @@ -171,24 +171,24 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas, SkBitmap* gradient_center = resource_bundle.GetBitmapNamed( IDR_BROWSER_ACTION_BADGE_CENTER); - canvas->AsCanvasSkia()->drawBitmap(*gradient_left, rect.fLeft, rect.fTop); + canvas->GetSkCanvas()->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->AsCanvasSkia()->drawBitmap(*gradient_right, + canvas->GetSkCanvas()->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->AsCanvasSkia()->clipRect(rect); - canvas->AsCanvasSkia()->drawText(text.c_str(), text.size(), - rect.fLeft + (rect.width() - text_width) / 2, - rect.fTop + kTextSize + kTopTextPadding, - *text_paint); + 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->Restore(); } |