Clean-up: Removes obsolete methods in gfx::Canvas.

ui/gfx/canvas.h

 // 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.
 
 #ifndef UI_GFX_CANVAS_H_
 #define UI_GFX_CANVAS_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 27 matching lines @@
 // source and destination colors are combined. Unless otherwise specified,
 // the variant that does not take a SkXfermode::Mode uses a transfer mode
 // of kSrcOver_Mode.
 class GFX_EXPORT Canvas {
  public:
   enum TruncateFadeMode {
     TruncateFadeTail,
     TruncateFadeHead,
   };
 
-  // Specifies the alignment for text rendered with the DrawStringInt method.
+  // Specifies the alignment for text rendered with the DrawStringRect method.
   enum {
     TEXT_ALIGN_LEFT = 1 << 0,
     TEXT_ALIGN_CENTER = 1 << 1,
     TEXT_ALIGN_RIGHT = 1 << 2,
 
     // Specifies the text consists of multiple lines.
     MULTI_LINE = 1 << 3,
 
-    // By default DrawStringInt does not process the prefix ('&') character
+    // By default DrawStringRect does not process the prefix ('&') character
     // specially. That is, the string "&foo" is rendered as "&foo". When
     // rendering text from a resource that uses the prefix character for
     // mnemonics, the prefix should be processed and can be rendered as an
     // underline (SHOW_PREFIX), or not rendered at all (HIDE_PREFIX).
     SHOW_PREFIX = 1 << 4,
     HIDE_PREFIX = 1 << 5,
 
     // Prevent ellipsizing
     NO_ELLIPSIS = 1 << 6,
 
     // Specifies if words can be split by new lines.
     // This only works with MULTI_LINE.
     CHARACTER_BREAK = 1 << 7,
 
-    // Instructs DrawStringInt() to render the text using RTL directionality.
+    // Instructs DrawStringRect() to render the text using RTL directionality.
     // In most cases, passing this flag is not necessary because information
     // about the text directionality is going to be embedded within the string
     // in the form of special Unicode characters. However, we don't insert
     // directionality characters into strings if the locale is LTR because some
     // platforms (for example, an English Windows XP with no RTL fonts
     // installed) don't support these characters. Thus, this flag should be
     // used to render text using RTL directionality when the locale is LTR.
     FORCE_RTL_DIRECTIONALITY = 1 << 8,
 
     // Similar to FORCE_RTL_DIRECTIONALITY, but left-to-right.
     // See FORCE_RTL_DIRECTIONALITY for details.
     FORCE_LTR_DIRECTIONALITY = 1 << 9,
 
-    // Instructs DrawStringInt() to not use subpixel rendering.  This is useful
+    // Instructs DrawStringRect() to not use subpixel rendering.  This is useful
     // when rendering text onto a fully- or partially-transparent background
     // that will later be blended with another image.
     NO_SUBPIXEL_RENDERING = 1 << 10,
   };
 
   // Creates an empty canvas with image_scale of 1x.
   Canvas();
 
   // Creates canvas with provided DIP |size| and |image_scale|.
   // If this canvas is not opaque, it's explicitly cleared to transparent before
@@ skipping 26 matching lines @@
   // Attempts to fit the text with the provided width and height. Increases
   // height and then width as needed to make the text fit. This method
   // supports multiple lines. On Skia only a line_height can be specified and
   // specifying a 0 value for it will cause the default height to be used.
   static void SizeStringInt(const base::string16& text,
                             const FontList& font_list,
                             int* width,
                             int* height,
                             int line_height,
                             int flags);
-  // Obsolete version.  Use the above version which takes FontList.
-  static void SizeStringInt(const base::string16& text,
-                            const Font& font,
-                            int* width,
-                            int* height,
-                            int line_height,
-                            int flags);
 
   // This is same as SizeStringInt except that fractional size is returned.
   // See comment in GetStringWidthF for its usage.
   static void SizeStringFloat(const base::string16& text,
                               const FontList& font_list,
                               float* width,
                               float* height,
                               int line_height,
                               int flags);
 
   // Returns the number of horizontal pixels needed to display the specified
   // |text| with |font_list|.
   static int GetStringWidth(const base::string16& text,
                             const FontList& font_list);
   // Obsolete version.  Use the above version which takes FontList.
   static int GetStringWidth(const base::string16& text, const Font& font);
 
   // This is same as GetStringWidth except that fractional width is returned.
   // Use this method for the scenario that multiple string widths need to be
   // summed up. This is because GetStringWidth returns the ceiled width and
   // adding multiple ceiled widths could cause more precision loss for certain
   // platform like Mac where the fractioal width is used.
   static float GetStringWidthF(const base::string16& text,
                                const FontList& font_list);
 
   // Returns the default text alignment to be used when drawing text on a
   // Canvas based on the directionality of the system locale language.
-  // This function is used by Canvas::DrawStringInt when the text alignment
+  // This function is used by Canvas::DrawStringRect when the text alignment
   // is not specified.
   //
   // This function returns either Canvas::TEXT_ALIGN_LEFT or
   // Canvas::TEXT_ALIGN_RIGHT.
   static int DefaultCanvasTextAlignment();
 
   // Draws text with a 1-pixel halo around it of the given color.
   // On Windows, it allows ClearType to be drawn to an otherwise transparent
   //   bitmap for drag images. Drag images have only 1-bit of transparency, so
   //   we don't do any fancy blurring.
   // On Linux, text with halo is created by stroking it with 2px |halo_color|
   //   then filling it with |text_color|.
   // On Mac, NOTIMPLEMENTED.
   //   TODO(dhollowa): Skia-native implementation is underway.  Cut over to
   //   that when ready.  http::/crbug.com/109946
   void DrawStringRectWithHalo(const base::string16& text,
                               const FontList& font_list,
                               SkColor text_color,
                               SkColor halo_color,
                               const Rect& display_rect,
                               int flags);
-  // Obsolete version.  Use the above version which takes FontList.
-  void DrawStringWithHalo(const base::string16& text,
-                          const Font& font,
-                          SkColor text_color,
-                          SkColor halo_color,
-                          int x,
-                          int y,
-                          int w,
-                          int h,
-                          int flags);
 
   // Extracts an ImageSkiaRep from the contents of this canvas.
   ImageSkiaRep ExtractImageRep() const;
 
   // Draws a dashed rectangle of the specified color.
   void DrawDashedRect(const Rect& rect, SkColor color);
 
   // Saves a copy of the drawing state onto a stack, operating on this copy
   // until a balanced call to Restore() is made.
   void Save();
@@ skipping 140 matching lines @@
                        const SkPath& path,
                        const SkPaint& paint);
 
   // Draws text with the specified color, fonts and location. The text is
   // aligned to the left, vertically centered, clipped to the region. If the
   // text is too big, it is truncated and '...' is added to the end.
   void DrawStringRect(const base::string16& text,
                       const FontList& font_list,
                       SkColor color,
                       const Rect& display_rect);
-  // Obsolete versions.  Use the above versions which take FontList.
-  void DrawStringInt(const base::string16& text,
-                     const Font& font,
-                     SkColor color,
-                     int x,
-                     int y,
-                     int w,
-                     int h);
-  void DrawStringInt(const base::string16& text,
-                     const Font& font,
-                     SkColor color,
-                     const Rect& display_rect);
 
   // Draws text with the specified color, fonts and location. The last argument
   // specifies flags for how the text should be rendered. It can be one of
   // TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT or TEXT_ALIGN_LEFT.
   void DrawStringRectWithFlags(const base::string16& text,
                                const FontList& font_list,
                                SkColor color,
                                const Rect& display_rect,
                                int flags);
-  // Obsolete version.  Use the above version which takes FontList.
-  void DrawStringInt(const base::string16& text,
-                     const Font& font,
-                     SkColor color,
-                     int x,
-                     int y,
-                     int w,
-                     int h,
-                     int flags);
 
-  // Similar to above DrawStringInt method but with text shadows support.
+  // Similar to above DrawStringRect method but with text shadows support.
   // Currently it's only implemented for canvas skia. Specifying a 0 line_height
   // will cause the default height to be used.
   void DrawStringRectWithShadows(const base::string16& text,
                                  const FontList& font_list,
                                  SkColor color,
                                  const Rect& text_bounds,
                                  int line_height,
                                  int flags,
                                  const ShadowValues& shadows);
-  // Obsolete version.  Use the above version which takes FontList.
-  void DrawStringWithShadows(const base::string16& text,
-                             const Font& font,
-                             SkColor color,
-                             const Rect& text_bounds,
-                             int line_height,
-                             int flags,
-                             const ShadowValues& shadows);
 
   // Draws a dotted gray rectangle used for focus purposes.
   void DrawFocusRect(const Rect& rect);
 
   // Draws a |rect| in the specified region with the specified |color| with a
   // with of one logical pixel which might be more device pixels.
   void DrawSolidFocusRect(const Rect& rect, SkColor color);
 
   // Tiles the image in the specified region.
   // Parameters are specified relative to current canvas scale not in pixels.
@@ skipping 75 matching lines @@
 
   skia::RefPtr<skia::PlatformCanvas> owned_canvas_;
   SkCanvas* canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(Canvas);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CANVAS_H_