Cleanup AdjustStringForLocaleDirection()

gfx/canvas_skia_win.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 "gfx/canvas_skia.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "gfx/font.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace {
 
 // We make sure that LTR text we draw in an RTL context is modified
 // appropriately to make sure it maintains it LTR orientation.
 void DoDrawText(HDC hdc,
                 const std::wstring& text,
                 RECT* text_bounds,
                 int flags) {
-  std::wstring localized_text;
-  const wchar_t* string_ptr = text.c_str();
-  int string_size = static_cast<int>(text.length());
   // Only adjust string directionality if both of the following are true:
   // 1. The current locale is RTL.
   // 2. The string itself has RTL directionality.
+  const wchar_t* string_ptr = text.c_str();
+  int string_size = static_cast<int>(text.length());
+
+  std::wstring localized_text;
   if (flags & DT_RTLREADING) {
-    if (base::i18n::AdjustStringForLocaleDirection(text, &localized_text)) {
-      string_ptr = localized_text.c_str();
-      string_size = static_cast<int>(localized_text.length());
-    }
+    localized_text = text;
+    base::i18n::AdjustStringForLocaleDirection(&localized_text);
+    string_ptr = localized_text.c_str();
+    string_size = static_cast<int>(localized_text.length());
   }
 
   DrawText(hdc, string_ptr, string_size, text_bounds, flags);
 }
 
 // Compute the windows flags necessary to implement the provided text Canvas
 // flags.
 int ComputeFormatFlags(int flags, const std::wstring& text) {
   // Setting the text alignment explicitly in case it hasn't already been set.
   // This will make sure that we don't align text to the left on RTL locales
@@ skipping 248 matching lines @@
         text_row[cur_x] |= 0xff << SK_A32_SHIFT;  // Make opaque.
       }
     }
   }
 
   // Draw the halo bitmap with blur.
   DrawBitmapInt(text_bitmap, x - 1, y - 1);
 }
 
 }  // namespace gfx