ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

ui/views/controls/label.cc

 // Copyright (c) 2012 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 "ui/views/controls/label.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <vector>
@@ skipping 274 matching lines @@
     // while adding NO_ELLIPSIS to the flags works on Windows for forcing
     // 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_.GetHeight();
     // 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;
+      flags |= gfx::CanvasSkia::NO_ELLIPSIS;
     gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h, flags);
     text_size_.SetSize(w, h);
     text_size_valid_ = true;
   }
 
   return text_size_;
 }
 
 void Label::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   text_size_valid_ &= !is_multi_line_;
 }
 
 void Label::OnPaint(gfx::Canvas* canvas) {
   OnPaintBackground(canvas);
   // We skip painting the focus border because it is being handled seperately by
   // some subclasses of Label. We do not want View's focus border painting to
   // interfere with that.
   OnPaintBorder(canvas);
 
   string16 paint_text;
   gfx::Rect text_bounds;
   int flags = 0;
   CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   PaintText(canvas, paint_text, text_bounds, flags);
 }
 
-void Label::OnPaintBackground(gfx::Canvas* canvas) {
+void Label::OnPaintBackground(gfx::CanvasSkia* canvas) {
   const Background* bg = contains_mouse_ ? GetMouseOverBackground() : NULL;
   if (!bg)
     bg = background();
   if (bg)
     bg->Paint(canvas, this);
 }
 
 // static
 gfx::Font Label::GetDefaultFont() {
   return ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
@@ skipping 90 matching lines @@
   }
   text_origin.Offset(0,
       std::max(0, (available_rect.height() - text_size.height())) / 2);
   return gfx::Rect(text_origin, text_size);
 }
 
 int Label::ComputeMultiLineFlags() const {
   if (!is_multi_line_)
     return 0;
 
-  int flags = gfx::Canvas::MULTI_LINE;
+  int flags = gfx::CanvasSkia::MULTI_LINE;
 #if !defined(OS_WIN)
     // Don't elide multiline labels on Linux.
     // Todo(davemoore): Do we depend on eliding multiline text?
     // Pango insists on limiting the number of lines to one if text is
     // elided. You can get around this if you can pass a maximum height
     // but we don't currently have that data when we call the pango code.
-    flags |= gfx::Canvas::NO_ELLIPSIS;
+    flags |= gfx::CanvasSkia::NO_ELLIPSIS;
 #endif
   if (allow_character_break_)
-    flags |= gfx::Canvas::CHARACTER_BREAK;
+    flags |= gfx::CanvasSkia::CHARACTER_BREAK;
   switch (horiz_alignment_) {
     case ALIGN_LEFT:
-      flags |= gfx::Canvas::TEXT_ALIGN_LEFT;
+      flags |= gfx::CanvasSkia::TEXT_ALIGN_LEFT;
       break;
     case ALIGN_CENTER:
-      flags |= gfx::Canvas::TEXT_ALIGN_CENTER;
+      flags |= gfx::CanvasSkia::TEXT_ALIGN_CENTER;
       break;
     case ALIGN_RIGHT:
-      flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
+      flags |= gfx::CanvasSkia::TEXT_ALIGN_RIGHT;
       break;
   }
   return flags;
 }
 
 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;
@@ skipping 28 matching lines @@
     *paint_text = text_;
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeMultiLineFlags();
 
   if (directionality_mode_ == AUTO_DETECT_DIRECTIONALITY) {
     base::i18n::TextDirection direction =
         base::i18n::GetFirstStrongCharacterDirection(GetText());
     if (direction == base::i18n::RIGHT_TO_LEFT)
-      *flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
+      *flags |= gfx::CanvasSkia::FORCE_RTL_DIRECTIONALITY;
     else
-      *flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+      *flags |= gfx::CanvasSkia::FORCE_LTR_DIRECTIONALITY;
   }
 }
 
 }  // namespace views