From a219f823813abcf778eceea2eb81f2d3967009a8 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 24 Jun 2010 23:30:26 +0000 Subject: Canvas refactoring part 3. - Replace Canvas instance users with CanvasSkia users. - Rename Canvas2 to Canvas. - Delete Canvas subclass of CanvasSkia. This has created some ugliness around the fact that people that used SkCanvas methods on Canvas now have to go through AsCanvasSkia first. This is temporary ugliness that will be eradicated as I incrementally build out the new Canvas API. BUG=none TEST=none Review URL: http://codereview.chromium.org/2825018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50784 0039d316-1c4b-4281-b951-d872f2087c98 --- views/view_text_utils.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'views/view_text_utils.cc') diff --git a/views/view_text_utils.cc b/views/view_text_utils.cc index 1fb39d3..ea1bba7 100644 --- a/views/view_text_utils.cc +++ b/views/view_text_utils.cc @@ -9,7 +9,7 @@ #include "base/i18n/word_iterator.h" #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "gfx/canvas.h" +#include "gfx/canvas_skia.h" #include "gfx/color_utils.h" #include "gfx/size.h" #include "views/controls/label.h" @@ -118,7 +118,7 @@ void DrawTextStartingFrom(gfx::Canvas* canvas, word = text; // Draw the whole text at once. int w = font.GetStringWidth(word), h = font.height(); - canvas->SizeStringInt(word, font, &w, &h, flags); + gfx::CanvasSkia::SizeStringInt(word, font, &w, &h, flags); // If we exceed the boundaries, we need to wrap. WrapIfWordDoesntFit(w, font.height(), position, bounds); @@ -132,7 +132,7 @@ void DrawTextStartingFrom(gfx::Canvas* canvas, // left of the LTR string. if (ltr_within_rtl && word[word.size() - 1] == L' ') { int space_w = font.GetStringWidth(L" "), space_h = font.height(); - canvas->SizeStringInt(L" ", font, &space_w, &space_h, flags); + gfx::CanvasSkia::SizeStringInt(L" ", font, &space_w, &space_h, flags); x += space_w; } } -- cgit v1.1