Title: [141200] branches/chromium/1364/Source/WebCore/html/shadow
Revision
141200
Author
[email protected]
Date
2013-01-29 18:19:31 -0800 (Tue, 29 Jan 2013)

Log Message

Merge 140791

> INPUT_MULTIPLE_FIELDS_UI: Refactoring: Remove confusing minimum() and maximum() of DateTimeSymbolicFieldElement
> https://bugs.webkit.org/show_bug.cgi?id=107918
> 
> Reviewed by Kentaro Hara.
> 
> DateTimeSymbolicFieldElement::minimum() and maximum() are very
> confusing. They don't return minimum/maximum value of 0-based symbol
> index though valueAsInteger is 0-based. These functions are used only
> for ARIA attributes in DateTimeFieldElement::initialize().
> 
> - Remove DateTimeFieldElement::minimum() and maximum(), and pass
> minimum/maximum values for ARIA attributes as function arguments.
> - DateTimeNumericFieldElement::maximum() is now non-virtual.
>   It is called by subclasses.
> 
> No new tests. This should not change any behavior.
> 
> * html/shadow/DateTimeFieldElement.cpp:
> (WebCore::DateTimeFieldElement::initialize):
> Add axMimimum/axMaximum arguments. Don't use minimum() and maximum().
> * html/shadow/DateTimeFieldElement.h:
> (DateTimeFieldElement): Ditto.
> * html/shadow/DateTimeNumericFieldElement.cpp:
> (WebCore::DateTimeNumericFieldElement::initialize):
> Pass m_range.minimum and maximum to DateTimeFieldElement::initialize().
> * html/shadow/DateTimeNumericFieldElement.h:
> (DateTimeNumericFieldElement):
> - Add initialize()
> - Make maximum() non-virtual
> - Remove minimum().
> * html/shadow/DateTimeSymbolicFieldElement.cpp:
> (WebCore::DateTimeSymbolicFieldElement::initialize):
> Pass m_minimumIndex + 1 and m_maximumIndex + 1 to
> DateTimeFieldElement::initialize().
> * html/shadow/DateTimeSymbolicFieldElement.h:
> (DateTimeSymbolicFieldElement):
> Add initialize() and remove minimum() and maximum().

[email protected]
BUG=crbug.com/172199
Review URL: https://codereview.chromium.org/12079062

Modified Paths

Diff

Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.cpp (141199 => 141200)


--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.cpp	2013-01-30 02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.cpp	2013-01-30 02:19:31 UTC (rev 141200)
@@ -140,11 +140,11 @@
     m_fieldOwner->focusOnNextField(*this);
 }
 
-void DateTimeFieldElement::initialize(const AtomicString& pseudo, const String& axHelpText)
+void DateTimeFieldElement::initialize(const AtomicString& pseudo, const String& axHelpText, int axMinimum, int axMaximum)
 {
     setAttribute(aria_helpAttr, axHelpText);
-    setAttribute(aria_valueminAttr, String::number(minimum()));
-    setAttribute(aria_valuemaxAttr, String::number(maximum()));
+    setAttribute(aria_valueminAttr, String::number(axMinimum));
+    setAttribute(aria_valuemaxAttr, String::number(axMaximum));
     setPseudo(pseudo);
     appendChild(Text::create(document(), visibleValue()));
 }

Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h (141199 => 141200)


--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h	2013-01-30 02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h	2013-01-30 02:19:31 UTC (rev 141200)
@@ -82,11 +82,9 @@
     virtual void didFocus();
     void focusOnNextField();
     virtual void handleKeyboardEvent(KeyboardEvent*) = 0;
-    void initialize(const AtomicString& pseudo, const String& axHelpText);
+    void initialize(const AtomicString& pseudo, const String& axHelpText, int axMinimum, int axMaximum);
     Locale& localeForOwner() const;
     AtomicString localeIdentifier() const;
-    virtual int maximum() const = 0;
-    virtual int minimum() const = 0;
     void updateVisibleValue(EventBehavior);
     virtual int valueAsInteger() const = 0;
 

Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp (141199 => 141200)


--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp	2013-01-30 02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp	2013-01-30 02:19:31 UTC (rev 141200)
@@ -162,14 +162,14 @@
     return m_hasValue;
 }
 
-int DateTimeNumericFieldElement::maximum() const
+void DateTimeNumericFieldElement::initialize(const AtomicString& pseudo, const String& axHelpText)
 {
-    return m_range.maximum;
+    DateTimeFieldElement::initialize(pseudo, axHelpText, m_range.minimum, m_range.maximum);
 }
 
-int DateTimeNumericFieldElement::minimum() const
+int DateTimeNumericFieldElement::maximum() const
 {
-    return m_range.minimum;
+    return m_range.maximum;
 }
 
 void DateTimeNumericFieldElement::setEmptyValue(EventBehavior eventBehavior)

Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h (141199 => 141200)


--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h	2013-01-30 02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h	2013-01-30 02:19:31 UTC (rev 141200)
@@ -68,7 +68,8 @@
 
     // DateTimeFieldElement functions.
     virtual bool hasValue() const OVERRIDE FINAL;
-    virtual int maximum() const OVERRIDE FINAL;
+    void initialize(const AtomicString& pseudo, const String& axHelpText);
+    int maximum() const;
     virtual void setEmptyValue(EventBehavior = DispatchNoEvent) OVERRIDE FINAL;
     virtual void setValueAsInteger(int, EventBehavior = DispatchNoEvent) OVERRIDE;
     virtual int valueAsInteger() const OVERRIDE FINAL;
@@ -79,7 +80,6 @@
     virtual void didBlur() OVERRIDE FINAL;
     virtual void handleKeyboardEvent(KeyboardEvent*) OVERRIDE FINAL;
     virtual float maximumWidth(const Font&) OVERRIDE;
-    virtual int minimum() const OVERRIDE FINAL;
     virtual void stepDown() OVERRIDE FINAL;
     virtual void stepUp() OVERRIDE FINAL;
     virtual String value() const OVERRIDE FINAL;

Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp (141199 => 141200)


--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp	2013-01-30 02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp	2013-01-30 02:19:31 UTC (rev 141200)
@@ -87,16 +87,14 @@
     return m_selectedIndex >= 0;
 }
 
-int DateTimeSymbolicFieldElement::maximum() const
+void DateTimeSymbolicFieldElement::initialize(const AtomicString& pseudo, const String& axHelpText)
 {
-    return static_cast<int>(m_symbols.size());
+    // The minimum and maximum below are exposed to users, and 1-based numbers
+    // are natural for symbolic fields. For example, the minimum value of a
+    // month field should be 1, not 0.
+    DateTimeFieldElement::initialize(pseudo, axHelpText, 1, static_cast<int>(m_symbols.size()));
 }
 
-int DateTimeSymbolicFieldElement::minimum() const
-{
-    return 1;
-}
-
 void DateTimeSymbolicFieldElement::setEmptyValue(EventBehavior eventBehavior)
 {
     if (isReadOnly())

Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h (141199 => 141200)


--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h	2013-01-30 02:17:59 UTC (rev 141199)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h	2013-01-30 02:19:31 UTC (rev 141200)
@@ -41,6 +41,7 @@
     DateTimeSymbolicFieldElement(Document*, FieldOwner&, const Vector<String>&);
     size_t symbolsSize() const { return m_symbols.size(); }
     virtual bool hasValue() const OVERRIDE FINAL;
+    void initialize(const AtomicString& pseudo, const String& axHelpText);
     virtual void setEmptyValue(EventBehavior = DispatchNoEvent) OVERRIDE FINAL;
     virtual void setValueAsInteger(int, EventBehavior = DispatchNoEvent) OVERRIDE FINAL;
     virtual int valueAsInteger() const OVERRIDE FINAL;
@@ -52,9 +53,7 @@
 
     // DateTimeFieldElement functions.
     virtual void handleKeyboardEvent(KeyboardEvent*) OVERRIDE FINAL;
-    virtual int maximum() const OVERRIDE FINAL;
     virtual float maximumWidth(const Font&) OVERRIDE;
-    virtual int minimum() const OVERRIDE FINAL;
     virtual void stepDown() OVERRIDE FINAL;
     virtual void stepUp() OVERRIDE FINAL;
     virtual String value() const OVERRIDE FINAL;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to