Revert 50784 - Canvas refactoring part 3....

views/view_text_utils.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/view_text_utils.h"
 
 #include "app/bidi_line_iterator.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/word_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/color_utils.h"
 #include "gfx/size.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 
 namespace view_text_utils {
 
 void DrawTextAndPositionUrl(gfx::Canvas* canvas,
                             views::Label* label,
                             const std::wstring& text,
@@ skipping 88 matching lines @@
   // iterate to the next line breaking opportunity.
   while (iter.Advance()) {
     // Get the word and figure out the dimensions.
     std::wstring word;
     if (!ltr_within_rtl)
       word = UTF16ToWide(iter.GetWord());  // Get the next word.
     else
       word = text;  // Draw the whole text at once.
 
     int w = font.GetStringWidth(word), h = font.height();
-    gfx::CanvasSkia::SizeStringInt(word, font, &w, &h, flags);
+    canvas->SizeStringInt(word, font, &w, &h, flags);
 
     // If we exceed the boundaries, we need to wrap.
     WrapIfWordDoesntFit(w, font.height(), position, bounds);
 
     int x = label->MirroredXCoordinateInsideView(position->width()) +
                                                  bounds.x();
     if (text_direction_is_rtl) {
       x -= w;
       // When drawing LTR strings inside RTL text we need to make sure we
       // 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] == L' ') {
         int space_w = font.GetStringWidth(L" "), space_h = font.height();
-        gfx::CanvasSkia::SizeStringInt(L" ", font, &space_w, &space_h, flags);
+        canvas->SizeStringInt(L" ", font, &space_w, &space_h, flags);
         x += space_w;
       }
     }
     int y = position->height() + bounds.y();
 
     // Draw the text on the screen (mirrored, if RTL run).
     canvas->DrawStringInt(word, font, text_color, x, y, w, font.height(),
                           flags);
 
     if (word.size() > 0 && word[word.size() - 1] == L'\x0a') {
@@ skipping 14 matching lines @@
                          int font_height,
                          gfx::Size* position,
                          const gfx::Rect& bounds) {
   if (position->width() + word_width > bounds.right()) {
     position->set_width(0);
     position->Enlarge(0, font_height);
   }
 }
 
 }  // namespace view_text_utils