Extra parameter to pass sub-message direction

content/renderer/render_view_impl.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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 1582 matching lines @@
 #if defined(OS_ANDROID)
   ipc_params.capture = params.useMediaCapture;
 #endif
 
   return ScheduleFileChooser(ipc_params, chooser_completion);
 }
 
 void RenderViewImpl::showValidationMessage(
     const blink::WebRect& anchor_in_root_view,
     const blink::WebString& main_text,
+    blink::WebTextDirection main_text_hint,
     const blink::WebString& sub_text,
-    blink::WebTextDirection hint) {
+    blink::WebTextDirection sub_text_hint) {
   base::string16 wrapped_main_text = main_text;
   base::string16 wrapped_sub_text = sub_text;
-  if (hint == blink::WebTextDirectionLeftToRight) {
+  if (main_text_hint == blink::WebTextDirectionLeftToRight)
     wrapped_main_text =
-        base::i18n::GetDisplayStringInLTRDirectionality(wrapped_main_text);
-    if (!wrapped_sub_text.empty()) {
+      base::i18n::GetDisplayStringInLTRDirectionality(wrapped_main_text);
+  else if (main_text_hint == blink::WebTextDirectionRightToLeft
+    && !base::i18n::IsRTL())
+      base::i18n::WrapStringWithRTLFormatting(&wrapped_main_text);
+
+  if (!wrapped_sub_text.empty()) {
+    if (sub_text_hint == blink::WebTextDirectionLeftToRight)
       wrapped_sub_text =
-          base::i18n::GetDisplayStringInLTRDirectionality(wrapped_sub_text);
-    }
-  } else if (hint == blink::WebTextDirectionRightToLeft
-             && !base::i18n::IsRTL()) {
-    base::i18n::WrapStringWithRTLFormatting(&wrapped_main_text);
-    if (!wrapped_sub_text.empty()) {
+        base::i18n::GetDisplayStringInLTRDirectionality(wrapped_sub_text);
+    else if (sub_text_hint == blink::WebTextDirectionRightToLeft)
       base::i18n::WrapStringWithRTLFormatting(&wrapped_sub_text);
-    }
   }
   Send(new ViewHostMsg_ShowValidationMessage(
     routing_id(), anchor_in_root_view, wrapped_main_text, wrapped_sub_text));
 }
 
 void RenderViewImpl::hideValidationMessage() {
   Send(new ViewHostMsg_HideValidationMessage(routing_id()));
 }
 
 void RenderViewImpl::moveValidationMessage(
@@ skipping 2383 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content