Merge 140788

Source/WebCore/html/shadow/DateTimeFieldElements.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 116 matching lines @@
     return field.release();
 }
 
 void DateTimeHourFieldElement::populateDateTimeFieldsState(DateTimeFieldsState& dateTimeFieldsState)
 {
     if (!hasValue()) {
         dateTimeFieldsState.setHour(DateTimeFieldsState::emptyValue);
         return;
     }
 
-    const int value = DateTimeNumericFieldElement::valueAsInteger();
+    const int value = valueAsInteger();
 
     switch (maximum()) {
     case 11:
         dateTimeFieldsState.setHour(value ? value : 12);
         return;
     case 12:
         dateTimeFieldsState.setHour(value);
         return;
     case 23:
         dateTimeFieldsState.setHour(value ? value % 12 : 12);
@@ skipping 55 matching lines @@
         ASSERT_NOT_REACHED();
     }
 }
 
 void DateTimeHourFieldElement::setValueAsInteger(int valueAsHour23, EventBehavior eventBehavior)
 {
     const int value = Range(0, 23).clampValue(valueAsHour23) % m_alignment;
     DateTimeNumericFieldElement::setValueAsInteger(range().minimum && !value ? m_alignment : value, eventBehavior);
 }
 
-int DateTimeHourFieldElement::valueAsInteger() const
-{
-    return hasValue() ? DateTimeNumericFieldElement::valueAsInteger() % m_alignment : -1;
-}
-
 // ----------------------------
 
 DateTimeMillisecondFieldElement::DateTimeMillisecondFieldElement(Document* document, FieldOwner& fieldOwner, const DateTimeNumericFieldElement::Parameters& parameters)
     : DateTimeNumericFieldElement(document, fieldOwner, 0, 999, "---", parameters)
 {
 }
 
 PassRefPtr<DateTimeMillisecondFieldElement> DateTimeMillisecondFieldElement::create(Document* document, FieldOwner& fieldOwner, const DateTimeNumericFieldElement::Parameters& parameters)
 {
     DEFINE_STATIC_LOCAL(AtomicString, millisecondPsuedoId, ("-webkit-datetime-edit-millisecond-field", AtomicString::ConstructFromLiteral));
@@ skipping 305 matching lines @@
         setValueAsInteger(value);
         return;
     }
 
     setEmptyValue();
 }
 
 } // namespace WebCore
 
 #endif