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

Unified Diff: ui/views/view_text_utils.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/views/examples/text_example.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view_text_utils.cc
diff --git a/ui/views/view_text_utils.cc b/ui/views/view_text_utils.cc
index 8bd5e150e14dbd93b0a309655b7366011b634951..0ea27d7624d9c35c09ab5a3af10e7197caa12e98 100644
--- a/ui/views/view_text_utils.cc
+++ b/ui/views/view_text_utils.cc
@@ -111,7 +111,7 @@ void DrawTextStartingFrom(gfx::Canvas* canvas,
word = text; // Draw the whole text at once.
int w = 0, h = 0;
- gfx::CanvasSkia::SizeStringInt(word, font, &w, &h, flags);
+ gfx::Canvas::SizeStringInt(word, font, &w, &h, flags);
// If we exceed the boundaries, we need to wrap.
WrapIfWordDoesntFit(w, font.GetHeight(), position, bounds);
@@ -123,7 +123,7 @@ void DrawTextStartingFrom(gfx::Canvas* canvas,
// draw the trailing space (if one exists after the LTR text) to the
// left of the LTR string.
if (ltr_within_rtl && word[word.size() - 1] == ' ')
- x += gfx::CanvasSkia::GetStringWidth(ASCIIToUTF16(" "), font);
+ x += gfx::Canvas::GetStringWidth(ASCIIToUTF16(" "), font);
}
int y = position->height() + bounds.y();
« no previous file with comments | « ui/views/examples/text_example.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698