Revert 50784 - Canvas refactoring part 3....

views/controls/label.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/controls/label.h"
 
 #include <cmath>
 #include <limits>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/i18n/rtl.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/font.h"
 #include "gfx/insets.h"
 #include "views/background.h"
 
 namespace views {
 
 // static
 const char Label::kViewClassName[] = "views/Label";
 SkColor Label::kEnabledColor, Label::kDisabledColor;
@@ skipping 33 matching lines @@
 int Label::GetBaseline() {
   return GetInsets().top() + font_.baseline();
 }
 
 int Label::GetHeightForWidth(int w) {
   if (!is_multi_line_)
     return View::GetHeightForWidth(w);
 
   w = std::max(0, w - GetInsets().width());
   int h = font_.height();
-  gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h, ComputeMultiLineFlags());
+  gfx::Canvas::SizeStringInt(text_, font_, &w, &h, ComputeMultiLineFlags());
   return h + GetInsets().height();
 }
 
 void Label::DidChangeBounds(const gfx::Rect& previous,
                             const gfx::Rect& current) {
   text_size_valid_ &= !is_multi_line_;
 }
 
 void Label::Paint(gfx::Canvas* canvas) {
   PaintBackground(canvas);
@@ skipping 300 matching lines @@
     // SizeStringInt() to calculate the desired width, it doesn't seem to work
     // on Linux.
     int w = is_multi_line_ ?
         GetAvailableRect().width() : std::numeric_limits<int>::max();
     int h = font_.height();
     // For single-line strings, ignore the available width and calculate how
     // wide the text wants to be.
     int flags = ComputeMultiLineFlags();
     if (!is_multi_line_)
       flags |= gfx::Canvas::NO_ELLIPSIS;
-    gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h, flags);
+    gfx::Canvas::SizeStringInt(text_, font_, &w, &h, flags);
     text_size_.SetSize(w, h);
     text_size_valid_ = true;
   }
 
   return text_size_;
 }
 
 int Label::ComputeMultiLineFlags() const {
   if (!is_multi_line_)
     return 0;
@@ skipping 24 matching lines @@
 }
 
 gfx::Rect Label::GetAvailableRect() const {
   gfx::Rect bounds(gfx::Point(), size());
   gfx::Insets insets(GetInsets());
   bounds.Inset(insets.left(), insets.top(), insets.right(), insets.bottom());
   return bounds;
 }
 
 }  // namespace views