Merge 132985 - F4 inside <input type=time> should not open calendar picker

Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.cpp

Index: Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.cpp
===================================================================
--- Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.cpp	(revision 133257)
+++ Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.cpp	(working copy)
@@ -237,14 +237,11 @@
 {
     Document* document = element()->document();
     RefPtr<RenderTheme> theme = document->page() ? document->page()->theme() : RenderTheme::defaultTheme();
-    if (theme->shouldOpenPickerWithF4Key() && event->keyIdentifier() == "F4") {
+    if (m_pickerIndicatorIsVisible
+        && ((event->keyIdentifier() == "Down" && event->getModifierState("Alt")) || (theme->shouldOpenPickerWithF4Key() && event->keyIdentifier() == "F4"))) {
         if (m_pickerIndicatorElement)
             m_pickerIndicatorElement->openPopup();
         event->setDefaultHandled();
-    } else if (m_pickerIndicatorIsVisible && event->keyIdentifier() == "Down" && event->getModifierState("Alt")) {
-        if (m_pickerIndicatorElement)
-            m_pickerIndicatorElement->openPopup();
-        event->setDefaultHandled();
     } else
         forwardEvent(event);
 }