Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Unified Diff: ui/gfx/render_text_linux.cc

Issue 9705063: ui/gfx: Rename almost all entries from gfx::CanvasSkia to gfx::Canvas. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/platform_font_win.cc ('k') | ui/views/controls/button/text_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text_linux.cc
diff --git a/ui/gfx/render_text_linux.cc b/ui/gfx/render_text_linux.cc
index 54fa78d44b2c414405ac78b7423f787a452037b7..da63caafea21ddf28261e19341502eca29090bc2 100644
--- a/ui/gfx/render_text_linux.cc
+++ b/ui/gfx/render_text_linux.cc
@@ -242,7 +242,7 @@ void RenderTextLinux::ResetLayout() {
void RenderTextLinux::EnsureLayout() {
if (layout_ == NULL) {
- CanvasSkia canvas(display_rect().size(), false);
+ Canvas canvas(display_rect().size(), false);
skia::ScopedPlatformPaint scoped_platform_paint(canvas.sk_canvas());
cairo_t* cr = scoped_platform_paint.GetPlatformSurface();
@@ -253,7 +253,7 @@ void RenderTextLinux::EnsureLayout() {
font_list().GetFontDescriptionString(),
display_rect().width(),
base::i18n::GetFirstStrongCharacterDirection(text()),
- CanvasSkia::DefaultCanvasTextAlignment());
+ Canvas::DefaultCanvasTextAlignment());
// No width set so that the x-axis position is relative to the start of the
// text. ToViewPoint and ToTextPoint take care of the position conversion
« no previous file with comments | « ui/gfx/platform_font_win.cc ('k') | ui/views/controls/button/text_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698