Custom validation message to take into account text direction

Source/web/ValidationMessageClientImpl.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  * SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "web/ValidationMessageClientImpl.h"
 
 #include "core/dom/Element.h"
 #include "core/frame/FrameView.h"
 #include "core/rendering/RenderObject.h"
 #include "platform/HostWindow.h"
+#include "platform/text/BidiTextRun.h"
+#include "platform/text/PlatformLocale.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebString.h"
 #include "public/web/WebTextDirection.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebViewImpl.h"
 #include "wtf/CurrentTime.h"
 
 using namespace WebCore;
 
 namespace blink {
@@ skipping 14 matching lines @@
 
 ValidationMessageClientImpl::~ValidationMessageClientImpl()
 {
 }
 
 FrameView* ValidationMessageClientImpl::currentView()
 {
     return m_currentAnchor->document().view();
 }
 
-void ValidationMessageClientImpl::showValidationMessage(const Element& anchor, const String& message)
+void ValidationMessageClientImpl::showValidationMessage(const Element& anchor, const String& message, bool customError)
 {
     if (message.isEmpty()) {
         hideValidationMessage(anchor);
         return;
     }
     if (!anchor.renderBox())
         return;
     if (m_currentAnchor)
         hideValidationMessage(*m_currentAnchor);
     m_currentAnchor = &anchor;
     IntRect anchorInRootView = currentView()->contentsToRootView(anchor.pixelSnappedBoundingBox());
     m_lastAnchorRectInScreen = currentView()->hostWindow()->rootViewToScreen(anchorInRootView);
     m_lastPageScaleFactor = m_webView.pageScaleFactor();
     m_message = message;
-
-    WebTextDirection dir = m_currentAnchor->renderer()->style()->direction() == RTL ? WebTextDirectionRightToLeft : WebTextDirectionLeftToRight;
-    AtomicString title = m_currentAnchor->fastGetAttribute(HTMLNames::titleAttr);
-    m_webView.client()->showValidationMessage(anchorInRootView, m_message, title, dir);
-
     const double minimumSecondToShowValidationMessage = 5.0;
     const double secondPerCharacter = 0.05;
     const double statusCheckInterval = 0.1;
-    m_finishTime = monotonicallyIncreasingTime() + std::max(minimumSecondToShowValidationMessage, (message.length() + title.length()) * secondPerCharacter);
+
+    if (!customError) {
+        m_webView.client()->showValidationMessage(anchorInRootView, m_message, m_currentAnchor->locale().isRTL() ? WebTextDirectionRightToLeft: WebTextDirectionLeftToRight, String(), WebTextDirectionLeftToRight);
+        m_finishTime = monotonicallyIncreasingTime() + std::max(minimumSecondToShowValidationMessage, message.length() * secondPerCharacter);
+    } else {
+        AtomicString subMsg = m_currentAnchor->fastGetAttribute(HTMLNames::titleAttr);
+        bool hasStrongDirection;
+        WebTextDirection messageDir = determineDirectionality(message, hasStrongDirection) == LTR ? WebTextDirectionLeftToRight: WebTextDirectionRightToLeft;
+        WebTextDirection subMsgDir = WebTextDirectionLeftToRight;
+        if (!subMsg.isEmpty()) {
+            // Sub Msg takes direction of the element direction
+            AtomicString dir = m_currentAnchor->fastGetAttribute(HTMLNames::dirAttr);
+            if (dir.isEmpty()) {
+                subMsgDir = m_currentAnchor->renderer()->style()->direction() == LTR ? WebTextDirectionLeftToRight: WebTextDirectionRightToLeft;
+            } else {
+                subMsgDir = (equalIgnoringCase(dir, "auto") ? (determineDirectionality(message, hasStrongDirection) == LTR ? WebTextDirectionLeftToRight: WebTextDirectionRightToLeft)
+                    : (equalIgnoringCase(dir, "ltr") ? WebTextDirectionLeftToRight: WebTextDirectionRightToLeft));
+            }
+        }

[leviw_travelin_and_unemployed, 2014/07/16 04:26:22]

Can you put all this code into a helper function?

[Habib Virji, 2014/07/16 13:32:02]

Done.

+        m_webView.client()->showValidationMessage(anchorInRootView, m_message, messageDir, subMsg, subMsgDir);
+        m_finishTime = monotonicallyIncreasingTime() + std::max(minimumSecondToShowValidationMessage, (message.length() + subMsg.length()) * secondPerCharacter);

[leviw_travelin_and_unemployed, 2014/07/16 04:26:22]

It seems like this code doesn't need to be duplicated.

[Habib Virji, 2014/07/16 13:32:02]

It had subMsg.length which differed, changed to avoid duplication.

+    }
+
     // FIXME: We should invoke checkAnchorStatus actively when layout, scroll,
     // or page scale change happen.
     m_timer.startRepeating(statusCheckInterval, FROM_HERE);
 }
 
 void ValidationMessageClientImpl::hideValidationMessage(const Element& anchor)
 {
     if (!m_currentAnchor || !isValidationMessageVisible(anchor))
         return;
     m_timer.stop();
@@ skipping 45 matching lines @@
         hideValidationMessage(*m_currentAnchor);
 }
 
 void ValidationMessageClientImpl::trace(Visitor* visitor)
 {
     visitor->trace(m_currentAnchor);
     ValidationMessageClient::trace(visitor);
 }
 
 }