Diff
Modified: trunk/Source/WebCore/ChangeLog (125873 => 125874)
--- trunk/Source/WebCore/ChangeLog 2012-08-17 09:42:31 UTC (rev 125873)
+++ trunk/Source/WebCore/ChangeLog 2012-08-17 09:44:39 UTC (rev 125874)
@@ -1,3 +1,34 @@
+2012-08-17 Yoshifumi Inoue <yo...@chromium.org>
+
+ [Forms] Rename SpinButtonElement::StepActionHandler to SpinButtonOwner
+ https://bugs.webkit.org/show_bug.cgi?id=94311
+
+ Reviewed by Kent Tamura.
+
+ This patch renames SpinButtonElement::StepActionHandler class to
+ SpinButtonOwner for adding functions to it for communicating spin
+ button and its owner.
+
+ No new tests. This patch doesn't change behavior.
+
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::~TextFieldInputType):
+ (WebCore::TextFieldInputType::destroyShadowSubtree):
+ * html/TextFieldInputType.h:
+ (TextFieldInputType):
+ * html/shadow/DateTimeEditElement.cpp:
+ (WebCore::DateTimeEditElement::~DateTimeEditElement):
+ * html/shadow/DateTimeEditElement.h:
+ (DateTimeEditElement):
+ * html/shadow/SpinButtonElement.cpp:
+ (WebCore::SpinButtonElement::SpinButtonElement):
+ (WebCore::SpinButtonElement::create):
+ (WebCore::SpinButtonElement::doStepAction):
+ * html/shadow/SpinButtonElement.h:
+ (WebCore::SpinButtonElement::SpinButtonOwner::~SpinButtonOwner):
+ (SpinButtonElement):
+ (WebCore::SpinButtonElement::removeSpinButtonOwner):
+
2012-08-16 Simon Hausmann <simon.hausm...@nokia.com>
[Qt] Replace use of internal Weak smart pointer with JSWeakObjectMap
Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (125873 => 125874)
--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2012-08-17 09:42:31 UTC (rev 125873)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2012-08-17 09:44:39 UTC (rev 125874)
@@ -64,7 +64,7 @@
TextFieldInputType::~TextFieldInputType()
{
if (m_innerSpinButton)
- m_innerSpinButton->removeStepActionHandler();
+ m_innerSpinButton->removeSpinButtonOwner();
}
bool TextFieldInputType::isKeyboardFocusable(KeyboardEvent*) const
@@ -312,7 +312,7 @@
m_speechButton.clear();
#endif
if (m_innerSpinButton)
- m_innerSpinButton->removeStepActionHandler();
+ m_innerSpinButton->removeSpinButtonOwner();
m_innerSpinButton.clear();
m_container.clear();
}
Modified: trunk/Source/WebCore/html/TextFieldInputType.h (125873 => 125874)
--- trunk/Source/WebCore/html/TextFieldInputType.h 2012-08-17 09:42:31 UTC (rev 125873)
+++ trunk/Source/WebCore/html/TextFieldInputType.h 2012-08-17 09:44:39 UTC (rev 125874)
@@ -41,7 +41,7 @@
// The class represents types of which UI contain text fields.
// It supports not only the types for BaseTextInputType but also type=number.
-class TextFieldInputType : public InputType, private SpinButtonElement::StepActionHandler {
+class TextFieldInputType : public InputType, private SpinButtonElement::SpinButtonOwner {
protected:
TextFieldInputType(HTMLInputElement*);
virtual ~TextFieldInputType();
@@ -85,7 +85,7 @@
virtual bool appendFormData(FormDataList&, bool multipart) const OVERRIDE;
virtual void attach() OVERRIDE;
- // SpinButtonElement::StepActionHandler functions.
+ // SpinButtonElement::SpinButtonOwner functions.
virtual void spinButtonStepDown() OVERRIDE;
virtual void spinButtonStepUp() OVERRIDE;
Modified: trunk/Source/WebCore/html/shadow/DateTimeEditElement.cpp (125873 => 125874)
--- trunk/Source/WebCore/html/shadow/DateTimeEditElement.cpp 2012-08-17 09:42:31 UTC (rev 125873)
+++ trunk/Source/WebCore/html/shadow/DateTimeEditElement.cpp 2012-08-17 09:44:39 UTC (rev 125874)
@@ -202,7 +202,7 @@
m_fields[fieldIndex]->removeEventHandler();
if (m_spinButton)
- m_spinButton->removeStepActionHandler();
+ m_spinButton->removeSpinButtonOwner();
}
void DateTimeEditElement::addField(PassRefPtr<DateTimeFieldElement> field)
Modified: trunk/Source/WebCore/html/shadow/DateTimeEditElement.h (125873 => 125874)
--- trunk/Source/WebCore/html/shadow/DateTimeEditElement.h 2012-08-17 09:42:31 UTC (rev 125873)
+++ trunk/Source/WebCore/html/shadow/DateTimeEditElement.h 2012-08-17 09:44:39 UTC (rev 125874)
@@ -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::StepActionHandler {
+class DateTimeEditElement : public HTMLDivElement, public DateTimeFieldElement::FieldEventHandler, private SpinButtonElement::SpinButtonOwner {
WTF_MAKE_NONCOPYABLE(DateTimeEditElement);
public:
@@ -101,7 +101,7 @@
virtual void fieldValueChanged() OVERRIDE FINAL;
virtual void focusOnNextField() OVERRIDE FINAL;
- // SpinButtonElement::StepActionHandler functions.
+ // SpinButtonElement::SpinButtonOwner functions.
virtual void spinButtonStepDown() OVERRIDE FINAL;
virtual void spinButtonStepUp() OVERRIDE FINAL;
Modified: trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp (125873 => 125874)
--- trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp 2012-08-17 09:42:31 UTC (rev 125873)
+++ trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp 2012-08-17 09:44:39 UTC (rev 125874)
@@ -41,9 +41,9 @@
using namespace HTMLNames;
-inline SpinButtonElement::SpinButtonElement(Document* document, StepActionHandler& stepActionHandler)
+inline SpinButtonElement::SpinButtonElement(Document* document, SpinButtonOwner& spinButtonOwner)
: HTMLDivElement(divTag, document)
- , m_stepActionHandler(&stepActionHandler)
+ , m_spinButtonOwner(&spinButtonOwner)
, m_capturing(false)
, m_upDownState(Indeterminate)
, m_pressStartingState(Indeterminate)
@@ -51,9 +51,9 @@
{
}
-PassRefPtr<SpinButtonElement> SpinButtonElement::create(Document* document, StepActionHandler& stepActionHandler)
+PassRefPtr<SpinButtonElement> SpinButtonElement::create(Document* document, SpinButtonOwner& spinButtonOwner)
{
- return adoptRef(new SpinButtonElement(document, stepActionHandler));
+ return adoptRef(new SpinButtonElement(document, spinButtonOwner));
}
const AtomicString& SpinButtonElement::shadowPseudoId() const
@@ -169,13 +169,13 @@
void SpinButtonElement::doStepAction(int amount)
{
- if (!m_stepActionHandler)
+ if (!m_spinButtonOwner)
return;
if (amount > 0)
- m_stepActionHandler->spinButtonStepUp();
+ m_spinButtonOwner->spinButtonStepUp();
else if (amount < 0)
- m_stepActionHandler->spinButtonStepDown();
+ m_spinButtonOwner->spinButtonStepDown();
}
void SpinButtonElement::releaseCapture()
Modified: trunk/Source/WebCore/html/shadow/SpinButtonElement.h (125873 => 125874)
--- trunk/Source/WebCore/html/shadow/SpinButtonElement.h 2012-08-17 09:42:31 UTC (rev 125873)
+++ trunk/Source/WebCore/html/shadow/SpinButtonElement.h 2012-08-17 09:44:39 UTC (rev 125874)
@@ -41,20 +41,20 @@
Up,
};
- class StepActionHandler {
+ class SpinButtonOwner {
public:
- virtual ~StepActionHandler() { }
+ virtual ~SpinButtonOwner() { }
virtual void spinButtonStepDown() = 0;
virtual void spinButtonStepUp() = 0;
};
- // The owner of SpinButtonElement must call removeStepActionHandler
- // because SpinButtonElement can be outlive StepActionHandler
+ // The owner of SpinButtonElement must call removeSpinButtonOwner
+ // because SpinButtonElement can be outlive SpinButtonOwner
// implementation, e.g. during event handling.
- static PassRefPtr<SpinButtonElement> create(Document*, StepActionHandler&);
+ static PassRefPtr<SpinButtonElement> create(Document*, SpinButtonOwner&);
UpDownState upDownState() const { return m_upDownState; }
virtual void releaseCapture();
- void removeStepActionHandler() { m_stepActionHandler = 0; }
+ void removeSpinButtonOwner() { m_spinButtonOwner = 0; }
void step(int amount);
@@ -64,7 +64,7 @@
void forwardEvent(Event*);
private:
- SpinButtonElement(Document*, StepActionHandler&);
+ SpinButtonElement(Document*, SpinButtonOwner&);
virtual const AtomicString& shadowPseudoId() const;
virtual void detach();
@@ -80,7 +80,7 @@
virtual void setHovered(bool = true);
virtual bool isMouseFocusable() const { return false; }
- StepActionHandler* m_stepActionHandler;
+ SpinButtonOwner* m_spinButtonOwner;
bool m_capturing;
UpDownState m_upDownState;
UpDownState m_pressStartingState;
