summaryrefslogtreecommitdiffstats
path: root/ui/gfx/image
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 /ui/gfx/image
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 'ui/gfx/image')
-rw-r--r--ui/gfx/image/image.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc
index df611e1..bf21259 100644
--- a/ui/gfx/image/image.cc
+++ b/ui/gfx/image/image.cc
@@ -36,9 +36,8 @@ bool NSImageToSkBitmaps(NSImage* image, std::vector<const SkBitmap*>* bitmaps);
#if defined(TOOLKIT_USES_GTK)
const SkBitmap* GdkPixbufToSkBitmap(GdkPixbuf* pixbuf) {
CHECK(pixbuf);
- gfx::CanvasSkia canvas(gfx::Size(gdk_pixbuf_get_width(pixbuf),
- gdk_pixbuf_get_height(pixbuf)),
- /*is_opaque=*/false);
+ gfx::Canvas canvas(gfx::Size(gdk_pixbuf_get_width(pixbuf),
+ gdk_pixbuf_get_height(pixbuf)), false);
skia::ScopedPlatformPaint scoped_platform_paint(canvas.sk_canvas());
cairo_t* cr = scoped_platform_paint.GetPlatformSurface();
gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);