Extra parameter to pass sub-message direction

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 154c0cb394b79dffdb49ebec54066ddb1cfd9ce1..4066be431253a6d8f15afc6654814a1bd7e4c22f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1600,23 +1600,24 @@ bool RenderViewImpl::runFileChooser(
 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));