Cleanup unnecessary code in canvas_skia

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 22 matching lines @@
 // need to do a conversion. In particular you'll need to use |SkIntToScalar()|,
 // or if converting from a scalar to an integer |SkScalarRound()|.
 //
 // A handful of methods in this class are overloaded providing an additional
 // argument of type SkXfermode::Mode. SkXfermode::Mode specifies how the
 // 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:
   // Specifies the alignment for text rendered with the DrawStringRect method.

[msw, 2015/02/25 17:05:20]

nit: move this comment inside the enum to be grouped with TEXT_ALIGN_*.

[oshima, 2015/03/04 08:01:50]

Done.

   enum {
     TEXT_ALIGN_LEFT = 1 << 0,
     TEXT_ALIGN_CENTER = 1 << 1,
     TEXT_ALIGN_RIGHT = 1 << 2,
+    TEXT_ALIGN_TO_HEAD = 1 << 3,
 
     // Specifies the text consists of multiple lines.
-    MULTI_LINE = 1 << 3,
+    MULTI_LINE = 1 << 4,
 
     // 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,
+    SHOW_PREFIX = 1 << 5,
+    HIDE_PREFIX = 1 << 6,
 
     // Prevent ellipsizing
-    NO_ELLIPSIS = 1 << 6,
+    NO_ELLIPSIS = 1 << 7,
 
     // Specifies if words can be split by new lines.
     // This only works with MULTI_LINE.
-    CHARACTER_BREAK = 1 << 7,
-
-    // 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,
+    CHARACTER_BREAK = 1 << 8,
 
     // 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,
+    NO_SUBPIXEL_RENDERING = 1 << 9,
   };
 
   // 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
   // being returned.
   Canvas(const Size& size, float image_scale, bool is_opaque);
 
@@ skipping 361 matching lines @@
 
   skia::RefPtr<skia::PlatformCanvas> owned_canvas_;
   SkCanvas* canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(Canvas);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CANVAS_H_