summaryrefslogtreecommitdiffstats
path: root/ui/gfx/render_text_linux.cc
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 19:05:07 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 19:05:07 +0000
commitbe172ba8194e48970d90e9d873160b259df69b96 (patch)
tree677a1fedc8a836a42de1dba22d8c0663173a0f96 /ui/gfx/render_text_linux.cc
parent2c572bd1d4eec134ae40e00adbfa2c9d3d1ff1e7 (diff)
downloadchromium_src-be172ba8194e48970d90e9d873160b259df69b96.zip
chromium_src-be172ba8194e48970d90e9d873160b259df69b96.tar.gz
chromium_src-be172ba8194e48970d90e9d873160b259df69b96.tar.bz2
Allow CanvasSkia to bind to an existing SkCanvas.
BUG=None TEST=None Review URL: http://codereview.chromium.org/8122013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/render_text_linux.cc')
-rw-r--r--ui/gfx/render_text_linux.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/render_text_linux.cc b/ui/gfx/render_text_linux.cc
index d744a94..92af95e 100644
--- a/ui/gfx/render_text_linux.cc
+++ b/ui/gfx/render_text_linux.cc
@@ -94,7 +94,7 @@ void RenderTextLinux::Draw(Canvas* canvas) {
Rect bounds(display_rect());
// Clip the canvas to the text display area.
- CanvasSkia* canvas_skia = canvas->AsCanvasSkia();
+ SkCanvas* canvas_skia = canvas->GetSkCanvas();
skia::ScopedPlatformPaint scoped_platform_paint(canvas_skia);
cairo_t* cr = scoped_platform_paint.GetPlatformSurface();
@@ -498,7 +498,7 @@ SelectionModel RenderTextLinux::RightSelectionModelByWord(
PangoLayout* RenderTextLinux::EnsureLayout() {
if (layout_ == NULL) {
CanvasSkia canvas(display_rect().width(), display_rect().height(), false);
- skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
+ skia::ScopedPlatformPaint scoped_platform_paint(canvas.sk_canvas());
cairo_t* cr = scoped_platform_paint.GetPlatformSurface();
layout_ = pango_cairo_create_layout(cr);