Custom validation message to take into account text direction

Source/core/html/HTMLFormControlElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 19 matching lines @@
 #include "core/html/HTMLFieldSetElement.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLLegendElement.h"
 #include "core/html/ValidityState.h"
 #include "core/frame/UseCounter.h"
 #include "core/page/Page.h"
 #include "core/page/ValidationMessageClient.h"
 #include "core/rendering/RenderBox.h"
 #include "core/rendering/RenderTheme.h"
+#include "platform/text/BidiTextRun.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 HTMLFormControlElement::HTMLFormControlElement(const QualifiedName& tagName, Document& document, HTMLFormElement* form)
     : LabelableElement(tagName, document)
     , m_disabled(false)
     , m_isAutofilled(false)
@@ skipping 348 matching lines @@
     if (m_willValidateInitialized && m_willValidate == newWillValidate)
         return;
     m_willValidateInitialized = true;
     m_willValidate = newWillValidate;
     setNeedsValidityCheck();
     setNeedsStyleRecalc(SubtreeStyleChange);
     if (!m_willValidate)
         hideVisibleValidationMessage();
 }
 
+static void findCustomMessageTextDirection(const Element& anchor, const String& message, TextDirection& messageDir, String& subMessage, TextDirection& subMessageDir)
+{
+    bool hasStrongDirection;
+    subMessage = anchor.fastGetAttribute(titleAttr);
+    messageDir = determineDirectionality(message, hasStrongDirection);
+    if (!subMessage.isEmpty()) {
+        // Sub Msg takes direction of the element direction

[tkent, 2014/07/22 23:56:48]

Msg -> message

[Habib Virji, 2014/07/23 13:32:03]

Done.

+        subMessageDir = anchor.renderer()->style()->direction();
+        AtomicString dir = anchor.fastGetAttribute(dirAttr);

[tkent, 2014/07/22 23:56:49]

Line 417-419 has no effect.  It is unnecessary.

[Habib Virji, 2014/07/23 13:32:03]

Done. Removed but it did work correctly if <input dir=auto> was present. 

+        if (!dir.isEmpty() && equalIgnoringCase(dir, "auto"))
+            determineDirectionality(message, hasStrongDirection);
+    }
+}
+
 void HTMLFormControlElement::updateVisibleValidationMessage()
 {
     Page* page = document().page();
     if (!page)
         return;
     String message;
     if (renderer() && willValidate())
         message = validationMessage().stripWhiteSpace();
 
     m_hasValidationMessage = true;
     ValidationMessageClient* client = &page->validationMessageClient();
-    if (message.isEmpty())
+    if (message.isEmpty()) {
         client->hideValidationMessage(*this);
-    else
-        client->showValidationMessage(*this, message);
+    } else {
+        TextDirection messageDir, subMessageDir = LTR;

[tkent, 2014/07/22 23:56:49]

We don't declare multiple variables at once.

[Habib Virji, 2014/07/23 13:32:03]

Done.

+        String subMessage = String();
+        findCustomMessageTextDirection(*this, message, messageDir, subMessage, subMessageDir);
+        client->showValidationMessage(*this, message, messageDir, subMessage, subMessageDir);
+    }
 }
 
 void HTMLFormControlElement::hideVisibleValidationMessage()
 {
     if (!m_hasValidationMessage)
         return;
 
     if (ValidationMessageClient* client = validationMessageClient())
         client->hideValidationMessage(*this);
 }
@@ skipping 99 matching lines @@
 
 void HTMLFormControlElement::setFocus(bool flag)
 {
     LabelableElement::setFocus(flag);
 
     if (!flag && wasChangedSinceLastFormControlChangeEvent())
         dispatchFormControlChangeEvent();
 }
 
 } // namespace Webcore