Merge 137275

Source/WebCore/html/shadow/DateTimeFieldElement.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 13 matching lines @@
  */
 
 #include "config.h"
 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 #include "DateTimeFieldElement.h"
 
 #include "DateComponents.h"
 #include "HTMLNames.h"
 #include "KeyboardEvent.h"
 #include "LocalizedStrings.h"
+#include "PlatformLocale.h"
 #include "RenderObject.h"
 #include "Text.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 DateTimeFieldElement::FieldOwner::~FieldOwner()
 {
@@ skipping 39 matching lines @@
         if (keyboardEvent->getModifierState("Alt"))
             return;
         keyboardEvent->setDefaultHandled();
         stepDown();
         return;
     }
 
     if (keyIdentifier == "Left") {
         if (!m_fieldOwner)
             return;
-        if (isRTL() ? m_fieldOwner->focusOnNextField(*this) : m_fieldOwner->focusOnPreviousField(*this))
+        // FIXME: We'd like to use FocusController::advanceFocus(FocusDirectionLeft, ...)
+        // but it doesn't work for shadow nodes. webkit.org/b/104650
+        if (!localeForOwner().isRTL() && m_fieldOwner->focusOnPreviousField(*this))
             keyboardEvent->setDefaultHandled();
         return;
     }
 
     if (keyIdentifier == "Right") {
         if (!m_fieldOwner)
             return;
-        if (isRTL() ? m_fieldOwner->focusOnPreviousField(*this) : m_fieldOwner->focusOnNextField(*this))
+        // FIXME: We'd like to use FocusController::advanceFocus(FocusDirectionRight, ...)
+        // but it doesn't work for shadow nodes. webkit.org/b/104650
+        if (!localeForOwner().isRTL() && m_fieldOwner->focusOnNextField(*this))
             keyboardEvent->setDefaultHandled();
         return;
     }
 
     if (keyIdentifier == "Up") {
         keyboardEvent->setDefaultHandled();
         stepUp();
         return;
     }
 
@@ skipping 44 matching lines @@
     if (m_fieldOwner && m_fieldOwner->isFieldOwnerDisabledOrReadOnly())
         return false;
     return HTMLElement::isFocusable();
 }
 
 bool DateTimeFieldElement::isReadOnly() const
 {
     return fastHasAttribute(readonlyAttr);
 }
 
-bool DateTimeFieldElement::isRTL() const
+Locale& DateTimeFieldElement::localeForOwner() const
 {
-    return renderer() && renderer()->style()->direction() == RTL;
+    return document()->getCachedLocale(localeIdentifier());
 }
 
 AtomicString DateTimeFieldElement::localeIdentifier() const
 {
     return m_fieldOwner ? m_fieldOwner->localeIdentifier() : nullAtom;
 }
 
 float DateTimeFieldElement::maximumWidth(const Font&)
 {
     const float paddingLeftAndRight = 2; // This should match to html.css.
@@ skipping 25 matching lines @@
     setAttribute(aria_valuetextAttr, hasValue() ? newVisibleValue : AXDateTimeFieldEmptyValueText());
     setAttribute(aria_valuenowAttr, newVisibleValue);
 
     if (eventBehavior == DispatchEvent && m_fieldOwner)
         m_fieldOwner->fieldValueChanged();
 }
 
 } // namespace WebCore
 
 #endif