summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 17:32:42 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 17:32:42 +0000
commit4ddae4b52b381c1786c6e8608f50663e8c89ad6f (patch)
treebad24ee6acd22396bacd03098988f689c8e58e6a /ash
parentce0e05cc1caaf208488c954d2e715f73673ad89b (diff)
downloadchromium_src-4ddae4b52b381c1786c6e8608f50663e8c89ad6f.zip
chromium_src-4ddae4b52b381c1786c6e8608f50663e8c89ad6f.tar.gz
chromium_src-4ddae4b52b381c1786c6e8608f50663e8c89ad6f.tar.bz2
ui/gfx: Rename almost all entries from gfx::CanvasSkia to gfx::Canvas.
BUG=116572 R=asvitkine@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9705063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/app_list/drop_shadow_label.cc4
-rw-r--r--ash/launcher/launcher_button.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/app_list/drop_shadow_label.cc b/ash/app_list/drop_shadow_label.cc
index 169890f..de1c90f 100644
--- a/ash/app_list/drop_shadow_label.cc
+++ b/ash/app_list/drop_shadow_label.cc
@@ -40,7 +40,7 @@ void DropShadowLabel::PaintText(gfx::Canvas* canvas,
// when transfering contents on this canvas to target canvas.
gfx::Size canvas_size(text_bounds.width() + drop_shadow_size_,
text_bounds.height() + drop_shadow_size_);
- gfx::CanvasSkia text_canvas(canvas_size, false);
+ gfx::Canvas text_canvas(canvas_size, false);
const double kShadowOpacity = 0.2;
const SkColor shadow_color =
@@ -84,7 +84,7 @@ void DropShadowLabel::PaintText(gfx::Canvas* canvas,
SkPaint paint;
paint.setShader(s)->unref();
- gfx::CanvasSkia alpha_canvas(canvas_size, false);
+ gfx::Canvas alpha_canvas(canvas_size, false);
alpha_canvas.DrawRect(gfx::Rect(canvas_size), paint);
const SkBitmap& alpha_bitmap = const_cast<SkBitmap&>(
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index ff8ea97..82c4319 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -101,7 +101,7 @@ void LauncherButton::SetImage(const SkBitmap& image) {
icon_view_->SetImage(&image);
return;
}
- gfx::CanvasSkia canvas(gfx::Size(width, height), false);
+ gfx::Canvas canvas(gfx::Size(width, height), false);
canvas.DrawBitmapInt(image, 0, 0, image.width(), image.height(),
0, 0, width, height, false);
SkBitmap resized_image(canvas.ExtractBitmap());