Merge 134239 - Refactoring: set read-only values on layout in DateTimeEditElement

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 43 matching lines @@
         dateTimeFieldsState.setAMPM(valueAsInteger() ? DateTimeFieldsState::AMPMValuePM : DateTimeFieldsState::AMPMValueAM);
     else
         dateTimeFieldsState.setAMPM(DateTimeFieldsState::AMPMValueEmpty);
 }
 
 void DateTimeAMPMFieldElement::setValueAsDate(const DateComponents& date)
 {
     setValueAsInteger(date.hour() >= 12 ? 1 : 0);
 }
 
-void DateTimeAMPMFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState, const DateComponents& dateForReadOnlyField)
+void DateTimeAMPMFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState)
 {
     if (dateTimeFieldsState.hasAMPM())
         setValueAsInteger(dateTimeFieldsState.ampm());
     else
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
 }
 
 // ----------------------------
 
 DateTimeDayFieldElement::DateTimeDayFieldElement(Document* document, FieldOwner& fieldOwner, const String& placeholder)
     : DateTimeNumericFieldElement(document, fieldOwner, 1, 31, placeholder)
 {
 }
 
 PassRefPtr<DateTimeDayFieldElement> DateTimeDayFieldElement::create(Document* document, FieldOwner& fieldOwner, const String& placeholder)
 {
     DEFINE_STATIC_LOCAL(AtomicString, dayPsuedoId, ("-webkit-datetime-edit-day-field"));
     RefPtr<DateTimeDayFieldElement> field = adoptRef(new DateTimeDayFieldElement(document, fieldOwner, placeholder.isEmpty() ? ASCIILiteral("--") : placeholder));
     field->initialize(dayPsuedoId, AXDayOfMonthFieldText());
     return field.release();
 }
 
 void DateTimeDayFieldElement::populateDateTimeFieldsState(DateTimeFieldsState& dateTimeFieldsState)
 {
     dateTimeFieldsState.setDayOfMonth(hasValue() ? valueAsInteger() : DateTimeFieldsState::emptyValue);
 }
 
 void DateTimeDayFieldElement::setValueAsDate(const DateComponents& date)
 {
     setValueAsInteger(date.monthDay());
 }
 
-void DateTimeDayFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState, const DateComponents& dateForReadOnlyField)
+void DateTimeDayFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState)
 {
     if (!dateTimeFieldsState.hasDayOfMonth()) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     const unsigned value = dateTimeFieldsState.dayOfMonth();
     if (range().isInRange(static_cast<int>(value))) {
         setValueAsInteger(value);
         return;
     }
 
-    setEmptyValue(dateForReadOnlyField);
+    setEmptyValue();
 }
 
 // ----------------------------
 
 DateTimeHourFieldElement::DateTimeHourFieldElement(Document* document, FieldOwner& fieldOwner, int minimum, int maximum)
     : DateTimeNumericFieldElement(document, fieldOwner, minimum, maximum, "--")
     , m_alignment(maximum + maximum % 2)
 {
     ASSERT((!minimum && (maximum == 11 || maximum == 23)) || (minimum == 1 && (maximum == 12 || maximum == 24)));
 }
@@ skipping 38 matching lines @@
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 void DateTimeHourFieldElement::setValueAsDate(const DateComponents& date)
 {
     setValueAsInteger(date.hour());
 }
 
-void DateTimeHourFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState, const DateComponents& dateForReadOnlyField)
+void DateTimeHourFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState)
 {
     if (!dateTimeFieldsState.hasHour()) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     const int hour12 = dateTimeFieldsState.hour();
 
     if (hour12 < 1 || hour12 > 12) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     switch (maximum()) {
     case 11:
         DateTimeNumericFieldElement::setValueAsInteger(hour12 % 12);
         return;
     case 12:
         DateTimeNumericFieldElement::setValueAsInteger(hour12);
         return;
@@ skipping 43 matching lines @@
 void DateTimeMillisecondFieldElement::populateDateTimeFieldsState(DateTimeFieldsState& dateTimeFieldsState)
 {
     dateTimeFieldsState.setMillisecond(hasValue() ? valueAsInteger() : DateTimeFieldsState::emptyValue);
 }
 
 void DateTimeMillisecondFieldElement::setValueAsDate(const DateComponents& date)
 {
     setValueAsInteger(date.millisecond());
 }
 
-void DateTimeMillisecondFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState, const DateComponents& dateForReadOnlyField)
+void DateTimeMillisecondFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState)
 {
     if (!dateTimeFieldsState.hasMillisecond()) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     const unsigned value = dateTimeFieldsState.millisecond();
     if (value > static_cast<unsigned>(maximum())) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     setValueAsInteger(value);
 }
 
 // ----------------------------
 
 DateTimeMinuteFieldElement::DateTimeMinuteFieldElement(Document* document, FieldOwner& fieldOwner)
     : DateTimeNumericFieldElement(document, fieldOwner, 0, 59, "--")
@@ skipping 11 matching lines @@
 void DateTimeMinuteFieldElement::populateDateTimeFieldsState(DateTimeFieldsState& dateTimeFieldsState)
 {
     dateTimeFieldsState.setMinute(hasValue() ? valueAsInteger() : DateTimeFieldsState::emptyValue);
 }
 
 void DateTimeMinuteFieldElement::setValueAsDate(const DateComponents& date)
 {
     setValueAsInteger(date.minute());
 }
 
-void DateTimeMinuteFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState, const DateComponents& dateForReadOnlyField)
+void DateTimeMinuteFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState)
 {
     if (!dateTimeFieldsState.hasMinute()) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     const unsigned value = dateTimeFieldsState.minute();
     if (value > static_cast<unsigned>(maximum())) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     setValueAsInteger(value);
 }
 
 // ----------------------------
 
 DateTimeMonthFieldElement::DateTimeMonthFieldElement(Document* document, FieldOwner& fieldOwner, const String& placeholder)
     : DateTimeNumericFieldElement(document, fieldOwner, 1, 12, placeholder)
@@ skipping 11 matching lines @@
 void DateTimeMonthFieldElement::populateDateTimeFieldsState(DateTimeFieldsState& dateTimeFieldsState)
 {
     dateTimeFieldsState.setMonth(hasValue() ? valueAsInteger() : DateTimeFieldsState::emptyValue);
 }
 
 void DateTimeMonthFieldElement::setValueAsDate(const DateComponents& date)
 {
     setValueAsInteger(date.month() + 1);
 }
 
-void DateTimeMonthFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState, const DateComponents& dateForReadOnlyField)
+void DateTimeMonthFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState)
 {
     if (!dateTimeFieldsState.hasMonth()) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     const unsigned value = dateTimeFieldsState.month();
     if (range().isInRange(static_cast<int>(value))) {
         setValueAsInteger(value);
         return;
     }
 
-    setEmptyValue(dateForReadOnlyField);
+    setEmptyValue();
 }
 
 // ----------------------------
 
 DateTimeSecondFieldElement::DateTimeSecondFieldElement(Document* document, FieldOwner& fieldOwner)
     : DateTimeNumericFieldElement(document, fieldOwner, 0, 59, "--")
 {
 }
 
 PassRefPtr<DateTimeSecondFieldElement> DateTimeSecondFieldElement::create(Document* document, FieldOwner& fieldOwner)
 {
     DEFINE_STATIC_LOCAL(AtomicString, secondPsuedoId, ("-webkit-datetime-edit-second-field"));
     RefPtr<DateTimeSecondFieldElement> field = adoptRef(new DateTimeSecondFieldElement(document, fieldOwner));
     field->initialize(secondPsuedoId, AXSecondFieldText());
     return field.release();
 }
 
 void DateTimeSecondFieldElement::populateDateTimeFieldsState(DateTimeFieldsState& dateTimeFieldsState)
 {
     dateTimeFieldsState.setSecond(hasValue() ? valueAsInteger() : DateTimeFieldsState::emptyValue);
 }
 
 void DateTimeSecondFieldElement::setValueAsDate(const DateComponents& date)
 {
     setValueAsInteger(date.second());
 }
 
-void DateTimeSecondFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState, const DateComponents& dateForReadOnlyField)
+void DateTimeSecondFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState)
 {
     if (!dateTimeFieldsState.hasSecond()) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     const unsigned value = dateTimeFieldsState.second();
     if (value > static_cast<unsigned>(maximum())) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     setValueAsInteger(value);
 }
 
 // ----------------------------
 
 DateTimeSymbolicMonthFieldElement::DateTimeSymbolicMonthFieldElement(Document* document, FieldOwner& fieldOwner, const Vector<String>& labels)
     : DateTimeSymbolicFieldElement(document, fieldOwner, labels)
@@ skipping 14 matching lines @@
         dateTimeFieldsState.setMonth(DateTimeFieldsState::emptyValue);
     ASSERT(valueAsInteger() < static_cast<int>(symbolsSize()));
     dateTimeFieldsState.setMonth(valueAsInteger() + 1);
 }
 
 void DateTimeSymbolicMonthFieldElement::setValueAsDate(const DateComponents& date)
 {
     setValueAsInteger(date.month());
 }
 
-void DateTimeSymbolicMonthFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState, const DateComponents& dateForReadOnlyField)
+void DateTimeSymbolicMonthFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState)
 {
     if (!dateTimeFieldsState.hasMonth()) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     const unsigned value = dateTimeFieldsState.month() - 1;
     if (value >= symbolsSize()) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     setValueAsInteger(value);
 }
 
 // ----------------------------
 
 DateTimeWeekFieldElement::DateTimeWeekFieldElement(Document* document, FieldOwner& fieldOwner)
     : DateTimeNumericFieldElement(document, fieldOwner, DateComponents::minimumWeekNumber, DateComponents::maximumWeekNumber, "--")
@@ skipping 11 matching lines @@
 void DateTimeWeekFieldElement::populateDateTimeFieldsState(DateTimeFieldsState& dateTimeFieldsState)
 {
     dateTimeFieldsState.setWeekOfYear(hasValue() ? valueAsInteger() : DateTimeFieldsState::emptyValue);
 }
 
 void DateTimeWeekFieldElement::setValueAsDate(const DateComponents& date)
 {
     setValueAsInteger(date.week());
 }
 
-void DateTimeWeekFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState, const DateComponents& dateForReadOnlyField)
+void DateTimeWeekFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState)
 {
     if (!dateTimeFieldsState.hasWeekOfYear()) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     const unsigned value = dateTimeFieldsState.weekOfYear();
     if (range().isInRange(static_cast<int>(value))) {
         setValueAsInteger(value);
         return;
     }
 
-    setEmptyValue(dateForReadOnlyField);
+    setEmptyValue();
 }
 
 // ----------------------------
 
 DateTimeYearFieldElement::DateTimeYearFieldElement(Document* document, FieldOwner& fieldOwner, const DateTimeYearFieldElement::Parameters& parameters)
     : DateTimeNumericFieldElement(document, fieldOwner, parameters.minimumYear, parameters.maximumYear, parameters.placeholder.isEmpty() ? ASCIILiteral("----") : parameters.placeholder)
     , m_minIsSpecified(parameters.minIsSpecified)
     , m_maxIsSpecified(parameters.maxIsSpecified)
 {
     ASSERT(parameters.minimumYear >= DateComponents::minimumYear());
@@ skipping 39 matching lines @@
 void DateTimeYearFieldElement::populateDateTimeFieldsState(DateTimeFieldsState& dateTimeFieldsState)
 {
     dateTimeFieldsState.setYear(hasValue() ? valueAsInteger() : DateTimeFieldsState::emptyValue);
 }
 
 void DateTimeYearFieldElement::setValueAsDate(const DateComponents& date)
 {
     setValueAsInteger(date.fullYear());
 }
 
-void DateTimeYearFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState, const DateComponents& dateForReadOnlyField)
+void DateTimeYearFieldElement::setValueAsDateTimeFieldsState(const DateTimeFieldsState& dateTimeFieldsState)
 {
     if (!dateTimeFieldsState.hasYear()) {
-        setEmptyValue(dateForReadOnlyField);
+        setEmptyValue();
         return;
     }
 
     const unsigned value = dateTimeFieldsState.year();
     if (range().isInRange(static_cast<int>(value))) {
         setValueAsInteger(value);
         return;
     }
 
-    setEmptyValue(dateForReadOnlyField);
+    setEmptyValue();
 }
 
 } // namespace WebCore
 
 #endif