Diff
Modified: trunk/Source/WebCore/ChangeLog (127084 => 127085)
--- trunk/Source/WebCore/ChangeLog 2012-08-30 02:14:44 UTC (rev 127084)
+++ trunk/Source/WebCore/ChangeLog 2012-08-30 02:24:41 UTC (rev 127085)
@@ -1,3 +1,59 @@
+2012-08-29 Yoshifumi Inoue <[email protected]>
+
+ [Forms] Rename DateTimeFieldElement::FieldEventHandler to FieldOwner
+ https://bugs.webkit.org/show_bug.cgi?id=95280
+
+ Reviewed by Kent Tamura.
+
+ This patch renames DateTimeFieldElement::FieldEventHandler to FieldOwner
+ for matching functionaly of class and class name to add functions like
+ focusOnNextField().
+
+ This patch affects ports which enables both ENABLE_INPUT_TYPE_TIME and
+ ENABLE_INPUT_TYPE_TIME_MULTIPLE_FIELDS.
+
+ This patch is a part of changing Shift+Tab focus navigation of
+ multiple fields input time UI, bug 95168.
+
+ No new tests. This patch doesn't change behavior.
+
+ * html/shadow/DateTimeEditElement.h:
+ (DateTimeEditElement):
+ * html/shadow/DateTimeFieldElement.cpp:
+ (WebCore::DateTimeFieldElement::FieldOwner::~FieldOwner):
+ (WebCore::DateTimeFieldElement::DateTimeFieldElement):
+ (WebCore::DateTimeFieldElement::focusOnNextField):
+ (WebCore::DateTimeFieldElement::updateVisibleValue):
+ * html/shadow/DateTimeFieldElement.h:
+ (FieldOwner):
+ (WebCore::DateTimeFieldElement::removeEventHandler):
+ (DateTimeFieldElement):
+ * html/shadow/DateTimeFieldElements.cpp:
+ (WebCore::DateTimeAMPMFieldElement::DateTimeAMPMFieldElement):
+ (WebCore::DateTimeAMPMFieldElement::create):
+ (WebCore::DateTimeHourFieldElement::DateTimeHourFieldElement):
+ (WebCore::DateTimeHourFieldElement::create):
+ (WebCore::DateTimeMillisecondFieldElement::DateTimeMillisecondFieldElement):
+ (WebCore::DateTimeMillisecondFieldElement::create):
+ (WebCore::DateTimeMinuteFieldElement::DateTimeMinuteFieldElement):
+ (WebCore::DateTimeMinuteFieldElement::create):
+ (WebCore::DateTimeSecondFieldElement::DateTimeSecondFieldElement):
+ (WebCore::DateTimeSecondFieldElement::create):
+ * html/shadow/DateTimeFieldElements.h:
+ (DateTimeAMPMFieldElement):
+ (DateTimeHourFieldElement):
+ (DateTimeMillisecondFieldElement):
+ (DateTimeMinuteFieldElement):
+ (DateTimeSecondFieldElement):
+ * html/shadow/DateTimeNumericFieldElement.cpp:
+ (WebCore::DateTimeNumericFieldElement::DateTimeNumericFieldElement):
+ * html/shadow/DateTimeNumericFieldElement.h:
+ (DateTimeNumericFieldElement):
+ * html/shadow/DateTimeSymbolicFieldElement.cpp:
+ (WebCore::DateTimeSymbolicFieldElement::DateTimeSymbolicFieldElement):
+ * html/shadow/DateTimeSymbolicFieldElement.h:
+ (DateTimeSymbolicFieldElement):
+
2012-08-29 Dominic Mazzoni <[email protected]>
AX: Canvas should have a distinct role
Modified: trunk/Source/WebCore/html/shadow/DateTimeEditElement.h (127084 => 127085)
--- trunk/Source/WebCore/html/shadow/DateTimeEditElement.h 2012-08-30 02:14:44 UTC (rev 127084)
+++ trunk/Source/WebCore/html/shadow/DateTimeEditElement.h 2012-08-30 02:24:41 UTC (rev 127085)
@@ -42,7 +42,7 @@
// representing date and time, such as
// - Year, Month, Day Of Month
// - Hour, Minute, Second, Millisecond, AM/PM
-class DateTimeEditElement : public HTMLDivElement, public DateTimeFieldElement::FieldEventHandler, private SpinButtonElement::SpinButtonOwner {
+class DateTimeEditElement : public HTMLDivElement, public DateTimeFieldElement::FieldOwner, private SpinButtonElement::SpinButtonOwner {
WTF_MAKE_NONCOPYABLE(DateTimeEditElement);
public:
@@ -99,7 +99,7 @@
size_t previousFieldIndex() const;
void updateUIState();
- // DateTimeFieldElement::FieldEventHandler functions.
+ // DateTimeFieldElement::FieldOwner functions.
virtual void fieldValueChanged() OVERRIDE FINAL;
virtual void focusOnNextField() OVERRIDE FINAL;
Modified: trunk/Source/WebCore/html/shadow/DateTimeFieldElement.cpp (127084 => 127085)
--- trunk/Source/WebCore/html/shadow/DateTimeFieldElement.cpp 2012-08-30 02:14:44 UTC (rev 127084)
+++ trunk/Source/WebCore/html/shadow/DateTimeFieldElement.cpp 2012-08-30 02:24:41 UTC (rev 127085)
@@ -36,13 +36,13 @@
using namespace HTMLNames;
-DateTimeFieldElement::FieldEventHandler::~FieldEventHandler()
+DateTimeFieldElement::FieldOwner::~FieldOwner()
{
}
-DateTimeFieldElement::DateTimeFieldElement(Document* document, FieldEventHandler& fieldEventHandler)
+DateTimeFieldElement::DateTimeFieldElement(Document* document, FieldOwner& fieldOwner)
: HTMLElement(spanTag, document)
- , m_fieldEventHandler(&fieldEventHandler)
+ , m_fieldOwner(&fieldOwner)
{
}
@@ -89,8 +89,8 @@
void DateTimeFieldElement::focusOnNextField()
{
- if (m_fieldEventHandler)
- m_fieldEventHandler->focusOnNextField();
+ if (m_fieldOwner)
+ m_fieldOwner->focusOnNextField();
}
void DateTimeFieldElement::initialize(const AtomicString& shadowPseudoId)
@@ -122,8 +122,8 @@
textNode->replaceWholeText(newVisibleValue, ASSERT_NO_EXCEPTION);
- if (eventBehavior == DispatchEvent && m_fieldEventHandler)
- m_fieldEventHandler->fieldValueChanged();
+ if (eventBehavior == DispatchEvent && m_fieldOwner)
+ m_fieldOwner->fieldValueChanged();
}
double DateTimeFieldElement::valueAsDouble() const
Modified: trunk/Source/WebCore/html/shadow/DateTimeFieldElement.h (127084 => 127085)
--- trunk/Source/WebCore/html/shadow/DateTimeFieldElement.h 2012-08-30 02:14:44 UTC (rev 127084)
+++ trunk/Source/WebCore/html/shadow/DateTimeFieldElement.h 2012-08-30 02:24:41 UTC (rev 127085)
@@ -44,11 +44,11 @@
DispatchEvent,
};
- // FieldEventHandler implementer must call removeEventHandler when
+ // FieldOwner implementer must call removeEventHandler when
// it doesn't handle event, e.g. at destruction.
- class FieldEventHandler {
+ class FieldOwner {
public:
- virtual ~FieldEventHandler();
+ virtual ~FieldOwner();
virtual void fieldValueChanged() = 0;
virtual void focusOnNextField() = 0;
};
@@ -56,7 +56,7 @@
virtual void defaultEventHandler(Event*) OVERRIDE;
virtual bool hasValue() const = 0;
bool isReadOnly() const;
- void removeEventHandler() { m_fieldEventHandler = 0; }
+ void removeEventHandler() { m_fieldOwner = 0; }
void setReadOnly();
virtual void setEmptyValue(const DateComponents& dateForReadOnlyField, EventBehavior = DispatchNoEvent) = 0;
virtual void setValueAsDate(const DateComponents&) = 0;
@@ -69,7 +69,7 @@
virtual String visibleValue() const = 0;
protected:
- DateTimeFieldElement(Document*, FieldEventHandler&);
+ DateTimeFieldElement(Document*, FieldOwner&);
void focusOnNextField();
virtual void handleKeyboardEvent(KeyboardEvent*) = 0;
void initialize(const AtomicString&);
@@ -79,7 +79,7 @@
private:
void defaultKeyboardEventHandler(KeyboardEvent*);
- FieldEventHandler* m_fieldEventHandler;
+ FieldOwner* m_fieldOwner;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/html/shadow/DateTimeFieldElements.cpp (127084 => 127085)
--- trunk/Source/WebCore/html/shadow/DateTimeFieldElements.cpp 2012-08-30 02:14:44 UTC (rev 127084)
+++ trunk/Source/WebCore/html/shadow/DateTimeFieldElements.cpp 2012-08-30 02:24:41 UTC (rev 127085)
@@ -32,15 +32,15 @@
namespace WebCore {
-DateTimeAMPMFieldElement::DateTimeAMPMFieldElement(Document* document, FieldEventHandler& fieldEventHandler, const Vector<String>& ampmLabels)
- : DateTimeSymbolicFieldElement(document, fieldEventHandler, ampmLabels)
+DateTimeAMPMFieldElement::DateTimeAMPMFieldElement(Document* document, FieldOwner& fieldOwner, const Vector<String>& ampmLabels)
+ : DateTimeSymbolicFieldElement(document, fieldOwner, ampmLabels)
{
}
-PassRefPtr<DateTimeAMPMFieldElement> DateTimeAMPMFieldElement::create(Document* document, FieldEventHandler& fieldEventHandler, const Vector<String>& ampmLabels)
+PassRefPtr<DateTimeAMPMFieldElement> DateTimeAMPMFieldElement::create(Document* document, FieldOwner& fieldOwner, const Vector<String>& ampmLabels)
{
DEFINE_STATIC_LOCAL(AtomicString, ampmPsuedoId, ("-webkit-datetime-edit-ampm-field"));
- RefPtr<DateTimeAMPMFieldElement> field = adoptRef(new DateTimeAMPMFieldElement(document, fieldEventHandler, ampmLabels));
+ RefPtr<DateTimeAMPMFieldElement> field = adoptRef(new DateTimeAMPMFieldElement(document, fieldOwner, ampmLabels));
field->initialize(ampmPsuedoId);
return field.release();
}
@@ -57,17 +57,17 @@
// ----------------------------
-DateTimeHourFieldElement::DateTimeHourFieldElement(Document* document, FieldEventHandler& fieldEventHandler, int minimum, int maximum)
- : DateTimeNumericFieldElement(document, fieldEventHandler, minimum, maximum)
+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)));
}
-PassRefPtr<DateTimeHourFieldElement> DateTimeHourFieldElement::create(Document* document, FieldEventHandler& fieldEventHandler, int minimum, int maximum)
+PassRefPtr<DateTimeHourFieldElement> DateTimeHourFieldElement::create(Document* document, FieldOwner& fieldOwner, int minimum, int maximum)
{
DEFINE_STATIC_LOCAL(AtomicString, hourPsuedoId, ("-webkit-datetime-edit-hour-field"));
- RefPtr<DateTimeHourFieldElement> field = adoptRef(new DateTimeHourFieldElement(document, fieldEventHandler, minimum, maximum));
+ RefPtr<DateTimeHourFieldElement> field = adoptRef(new DateTimeHourFieldElement(document, fieldOwner, minimum, maximum));
field->initialize(hourPsuedoId);
return field.release();
}
@@ -95,15 +95,15 @@
// ----------------------------
-DateTimeMillisecondFieldElement::DateTimeMillisecondFieldElement(Document* document, FieldEventHandler& fieldEventHandler)
- : DateTimeNumericFieldElement(document, fieldEventHandler, 0, 999)
+DateTimeMillisecondFieldElement::DateTimeMillisecondFieldElement(Document* document, FieldOwner& fieldOwner)
+ : DateTimeNumericFieldElement(document, fieldOwner, 0, 999)
{
}
-PassRefPtr<DateTimeMillisecondFieldElement> DateTimeMillisecondFieldElement::create(Document* document, FieldEventHandler& fieldEventHandler)
+PassRefPtr<DateTimeMillisecondFieldElement> DateTimeMillisecondFieldElement::create(Document* document, FieldOwner& fieldOwner)
{
DEFINE_STATIC_LOCAL(AtomicString, millisecondPsuedoId, ("-webkit-datetime-edit-millisecond-field"));
- RefPtr<DateTimeMillisecondFieldElement> field = adoptRef(new DateTimeMillisecondFieldElement(document, fieldEventHandler));
+ RefPtr<DateTimeMillisecondFieldElement> field = adoptRef(new DateTimeMillisecondFieldElement(document, fieldOwner));
field->initialize(millisecondPsuedoId);
return field.release();
}
@@ -120,15 +120,15 @@
// ----------------------------
-DateTimeMinuteFieldElement::DateTimeMinuteFieldElement(Document* document, FieldEventHandler& fieldEventHandler)
- : DateTimeNumericFieldElement(document, fieldEventHandler, 0, 59)
+DateTimeMinuteFieldElement::DateTimeMinuteFieldElement(Document* document, FieldOwner& fieldOwner)
+ : DateTimeNumericFieldElement(document, fieldOwner, 0, 59)
{
}
-PassRefPtr<DateTimeMinuteFieldElement> DateTimeMinuteFieldElement::create(Document* document, FieldEventHandler& fieldEventHandler)
+PassRefPtr<DateTimeMinuteFieldElement> DateTimeMinuteFieldElement::create(Document* document, FieldOwner& fieldOwner)
{
DEFINE_STATIC_LOCAL(AtomicString, minutePsuedoId, ("-webkit-datetime-edit-minute-field"));
- RefPtr<DateTimeMinuteFieldElement> field = adoptRef(new DateTimeMinuteFieldElement(document, fieldEventHandler));
+ RefPtr<DateTimeMinuteFieldElement> field = adoptRef(new DateTimeMinuteFieldElement(document, fieldOwner));
field->initialize(minutePsuedoId);
return field.release();
}
@@ -145,15 +145,15 @@
// ----------------------------
-DateTimeSecondFieldElement::DateTimeSecondFieldElement(Document* document, FieldEventHandler& fieldEventHandler)
- : DateTimeNumericFieldElement(document, fieldEventHandler, 0, 59)
+DateTimeSecondFieldElement::DateTimeSecondFieldElement(Document* document, FieldOwner& fieldOwner)
+ : DateTimeNumericFieldElement(document, fieldOwner, 0, 59)
{
}
-PassRefPtr<DateTimeSecondFieldElement> DateTimeSecondFieldElement::create(Document* document, FieldEventHandler& fieldEventHandler)
+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, fieldEventHandler));
+ RefPtr<DateTimeSecondFieldElement> field = adoptRef(new DateTimeSecondFieldElement(document, fieldOwner));
field->initialize(secondPsuedoId);
return field.release();
}
Modified: trunk/Source/WebCore/html/shadow/DateTimeFieldElements.h (127084 => 127085)
--- trunk/Source/WebCore/html/shadow/DateTimeFieldElements.h 2012-08-30 02:14:44 UTC (rev 127084)
+++ trunk/Source/WebCore/html/shadow/DateTimeFieldElements.h 2012-08-30 02:24:41 UTC (rev 127085)
@@ -36,10 +36,10 @@
WTF_MAKE_NONCOPYABLE(DateTimeAMPMFieldElement);
public:
- static PassRefPtr<DateTimeAMPMFieldElement> create(Document*, FieldEventHandler&, const Vector<String>&);
+ static PassRefPtr<DateTimeAMPMFieldElement> create(Document*, FieldOwner&, const Vector<String>&);
private:
- DateTimeAMPMFieldElement(Document*, FieldEventHandler&, const Vector<String>&);
+ DateTimeAMPMFieldElement(Document*, FieldOwner&, const Vector<String>&);
// DateTimeFieldElement functions.
virtual void setValueAsDate(const DateComponents&) OVERRIDE FINAL;
@@ -57,10 +57,10 @@
WTF_MAKE_NONCOPYABLE(DateTimeHourFieldElement);
public:
- static PassRefPtr<DateTimeHourFieldElement> create(Document*, FieldEventHandler&, int minimum, int maximum);
+ static PassRefPtr<DateTimeHourFieldElement> create(Document*, FieldOwner&, int minimum, int maximum);
private:
- DateTimeHourFieldElement(Document*, FieldEventHandler&, int minimum, int maximum);
+ DateTimeHourFieldElement(Document*, FieldOwner&, int minimum, int maximum);
// DateTimeFieldElement functions.
virtual void setValueAsDate(const DateComponents&) OVERRIDE FINAL;
@@ -75,10 +75,10 @@
WTF_MAKE_NONCOPYABLE(DateTimeMillisecondFieldElement);
public:
- static PassRefPtr<DateTimeMillisecondFieldElement> create(Document*, FieldEventHandler&);
+ static PassRefPtr<DateTimeMillisecondFieldElement> create(Document*, FieldOwner&);
private:
- DateTimeMillisecondFieldElement(Document*, FieldEventHandler&);
+ DateTimeMillisecondFieldElement(Document*, FieldOwner&);
// DateTimeFieldElement functions.
virtual void setValueAsDate(const DateComponents&) OVERRIDE FINAL;
@@ -89,10 +89,10 @@
WTF_MAKE_NONCOPYABLE(DateTimeMinuteFieldElement);
public:
- static PassRefPtr<DateTimeMinuteFieldElement> create(Document*, FieldEventHandler&);
+ static PassRefPtr<DateTimeMinuteFieldElement> create(Document*, FieldOwner&);
private:
- DateTimeMinuteFieldElement(Document*, FieldEventHandler&);
+ DateTimeMinuteFieldElement(Document*, FieldOwner&);
// DateTimeFieldElement functions.
virtual void setValueAsDate(const DateComponents&) OVERRIDE FINAL;
@@ -103,10 +103,10 @@
WTF_MAKE_NONCOPYABLE(DateTimeSecondFieldElement);
public:
- static PassRefPtr<DateTimeSecondFieldElement> create(Document*, FieldEventHandler&);
+ static PassRefPtr<DateTimeSecondFieldElement> create(Document*, FieldOwner&);
private:
- DateTimeSecondFieldElement(Document*, FieldEventHandler&);
+ DateTimeSecondFieldElement(Document*, FieldOwner&);
// DateTimeFieldElement functions.
virtual void setValueAsDate(const DateComponents&) OVERRIDE FINAL;
Modified: trunk/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp (127084 => 127085)
--- trunk/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp 2012-08-30 02:14:44 UTC (rev 127084)
+++ trunk/Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp 2012-08-30 02:24:41 UTC (rev 127085)
@@ -63,8 +63,8 @@
return std::min(std::max(value, minimum), maximum);
}
-DateTimeNumericFieldElement::DateTimeNumericFieldElement(Document* document, FieldEventHandler& fieldEventHandler, int minimum, int maximum)
- : DateTimeFieldElement(document, fieldEventHandler)
+DateTimeNumericFieldElement::DateTimeNumericFieldElement(Document* document, FieldOwner& fieldOwner, int minimum, int maximum)
+ : DateTimeFieldElement(document, fieldOwner)
, m_lastDigitCharTime(0)
, m_range(minimum, maximum)
, m_value(0)
Modified: trunk/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h (127084 => 127085)
--- trunk/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h 2012-08-30 02:14:44 UTC (rev 127084)
+++ trunk/Source/WebCore/html/shadow/DateTimeNumericFieldElement.h 2012-08-30 02:24:41 UTC (rev 127085)
@@ -50,7 +50,7 @@
int minimum;
};
- DateTimeNumericFieldElement(Document*, FieldEventHandler&, int minimum, int maximum);
+ DateTimeNumericFieldElement(Document*, FieldOwner&, int minimum, int maximum);
int clampValue(int value) const { return m_range.clampValue(value); }
const Range& range() const { return m_range; }
Modified: trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp (127084 => 127085)
--- trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp 2012-08-30 02:14:44 UTC (rev 127084)
+++ trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp 2012-08-30 02:24:41 UTC (rev 127085)
@@ -32,8 +32,8 @@
namespace WebCore {
-DateTimeSymbolicFieldElement::DateTimeSymbolicFieldElement(Document* document, FieldEventHandler& fieldEventHandler, const Vector<String>& symbols)
- : DateTimeFieldElement(document, fieldEventHandler)
+DateTimeSymbolicFieldElement::DateTimeSymbolicFieldElement(Document* document, FieldOwner& fieldOwner, const Vector<String>& symbols)
+ : DateTimeFieldElement(document, fieldOwner)
, m_symbols(symbols)
, m_selectedIndex(-1)
{
Modified: trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h (127084 => 127085)
--- trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h 2012-08-30 02:14:44 UTC (rev 127084)
+++ trunk/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h 2012-08-30 02:24:41 UTC (rev 127085)
@@ -37,7 +37,7 @@
WTF_MAKE_NONCOPYABLE(DateTimeSymbolicFieldElement);
protected:
- DateTimeSymbolicFieldElement(Document*, FieldEventHandler&, const Vector<String>&);
+ DateTimeSymbolicFieldElement(Document*, FieldOwner&, const Vector<String>&);
virtual void setValueAsInteger(int, EventBehavior = DispatchNoEvent) OVERRIDE FINAL;
private:
