Title: [141197] branches/chromium/1364/Source/WebCore/html/shadow
- Revision
- 141197
- Author
- [email protected]
- Date
- 2013-01-29 18:11:05 -0800 (Tue, 29 Jan 2013)
Log Message
Merge 140788
> INPUT_MULTIPLE_FIELDS_UI: Refactoring: Remove unused DateTimeHourFieldElement::valueAsInteger
> https://bugs.webkit.org/show_bug.cgi?id=107915
>
> Reviewed by Kentaro Hara.
>
> DateTimeHourFieldElement::valueAsInteger is never called. Remove it and
> make valueAsInteger non-public.
>
> No new tests. This shouldn't change any behavior.
>
> * html/shadow/DateTimeFieldElement.h:
> (DateTimeFieldElement): Make valueAsInteger protected.
> * html/shadow/DateTimeFieldElements.cpp:
> Remove DateTimeHourFieldElement::valueAsInteger.
> (WebCore::DateTimeHourFieldElement::populateDateTimeFieldsState):
> Remove unnecessary DateTimeNumericFieldElement:: prefix.
> * html/shadow/DateTimeFieldElements.h:
> (DateTimeHourFieldElement): Remove valueAsInteger.
> * html/shadow/DateTimeNumericFieldElement.h:
> (DateTimeNumericFieldElement):
> Make valueAsInteger FINAL.
BUG=crbug.com/172199
[email protected]
Review URL: https://codereview.chromium.org/12090060
Modified Paths
Diff
Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h (141196 => 141197)
--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h 2013-01-30 02:08:28 UTC (rev 141196)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h 2013-01-30 02:11:05 UTC (rev 141197)
@@ -74,7 +74,6 @@
virtual void stepDown() = 0;
virtual void stepUp() = 0;
virtual String value() const = 0;
- virtual int valueAsInteger() const = 0;
virtual String visibleValue() const = 0;
protected:
@@ -89,6 +88,7 @@
virtual int maximum() const = 0;
virtual int minimum() const = 0;
void updateVisibleValue(EventBehavior);
+ virtual int valueAsInteger() const = 0;
private:
void defaultKeyboardEventHandler(KeyboardEvent*);
Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElements.cpp (141196 => 141197)
--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElements.cpp 2013-01-30 02:08:28 UTC (rev 141196)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElements.cpp 2013-01-30 02:11:05 UTC (rev 141197)
@@ -134,7 +134,7 @@
return;
}
- const int value = DateTimeNumericFieldElement::valueAsInteger();
+ const int value = valueAsInteger();
switch (maximum()) {
case 11:
@@ -210,11 +210,6 @@
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)
Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElements.h (141196 => 141197)
--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElements.h 2013-01-30 02:08:28 UTC (rev 141196)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElements.h 2013-01-30 02:11:05 UTC (rev 141197)
@@ -82,7 +82,6 @@
virtual void setValueAsDate(const DateComponents&) OVERRIDE FINAL;
virtual void setValueAsDateTimeFieldsState(const DateTimeFieldsState&) OVERRIDE FINAL;
virtual void setValueAsInteger(int, EventBehavior = DispatchNoEvent) OVERRIDE FINAL;
- virtual int valueAsInteger() const OVERRIDE FINAL;
const int m_alignment;
};
Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h (141196 => 141197)
--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h 2013-01-30 02:08:28 UTC (rev 141196)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h 2013-01-30 02:11:05 UTC (rev 141197)
@@ -71,7 +71,7 @@
virtual int maximum() const OVERRIDE FINAL;
virtual void setEmptyValue(EventBehavior = DispatchNoEvent) OVERRIDE FINAL;
virtual void setValueAsInteger(int, EventBehavior = DispatchNoEvent) OVERRIDE;
- virtual int valueAsInteger() const OVERRIDE;
+ virtual int valueAsInteger() const OVERRIDE FINAL;
virtual String visibleValue() const OVERRIDE FINAL;
private:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes