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();
 }
 
+void HTMLFormControlElement::findCustomValidationMessageTextDirection(const String& message, TextDirection &messageDir, String& subMessage, TextDirection &subMessageDir)
+{
+    bool hasStrongDirection;
+    subMessage = fastGetAttribute(titleAttr);
+    messageDir = determineDirectionality(message, hasStrongDirection);
+    if (!subMessage.isEmpty())
+        subMessageDir = renderer()->style()->direction();
+}
+
 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();
+    TextDirection messageDir = LTR;
+    TextDirection subMessageDir = LTR;
+    String subMessage = String();
     if (message.isEmpty())
         client->hideValidationMessage(*this);
     else
-        client->showValidationMessage(*this, message);
+        findCustomValidationMessageTextDirection(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