| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 6c9a045e14cd1231a1b1d2fa26198f84b8e77bd4..939dae75a8ffb1076c6a0309cf10f60f64043341 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -1813,21 +1813,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()) {
|
| + } 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()) {
|
| + } else if (sub_text_hint == blink::WebTextDirectionRightToLeft) {
|
| base::i18n::WrapStringWithRTLFormatting(&wrapped_sub_text);
|
| }
|
| }
|
|
|