diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 23:05:57 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 23:05:57 +0000 |
| commit | f0e90a4e26a70a1f8aff72215e8102d142543be3 (patch) | |
| tree | 2b43d00873f2f387e2a58ee23615005e02de956c /ash | |
| parent | c356e4a2ee2eba8107370aeb054b6b7416df6eca (diff) | |
| download | chromium_src-f0e90a4e26a70a1f8aff72215e8102d142543be3.zip chromium_src-f0e90a4e26a70a1f8aff72215e8102d142543be3.tar.gz chromium_src-f0e90a4e26a70a1f8aff72215e8102d142543be3.tar.bz2 | |
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
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/system/audio/tray_volume.cc | 2 | ||||
| -rw-r--r-- | ash/system/tray/system_tray.cc | 6 | ||||
| -rw-r--r-- | ash/wm/frame_painter.cc | 2 |
3 files changed, 5 insertions, 5 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 |