diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/html/HTMLButtonElement.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/html/HTMLButtonElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLButtonElement.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/WebCore/html/HTMLButtonElement.cpp b/Source/WebCore/html/HTMLButtonElement.cpp index eff6fd857..b13b6a68f 100644 --- a/Source/WebCore/html/HTMLButtonElement.cpp +++ b/Source/WebCore/html/HTMLButtonElement.cpp @@ -63,10 +63,6 @@ RenderObject* HTMLButtonElement::createRenderer(RenderArena* arena, RenderStyle* return new (arena) RenderButton(this); } -void HTMLButtonElement::willAddAuthorShadowRoot() -{ -} - const AtomicString& HTMLButtonElement::formControlType() const { switch (m_type) { @@ -115,7 +111,7 @@ void HTMLButtonElement::parseAttribute(const QualifiedName& name, const AtomicSt void HTMLButtonElement::defaultEventHandler(Event* event) { - if (event->type() == eventNames().DOMActivateEvent && !disabled()) { + if (event->type() == eventNames().DOMActivateEvent && !isDisabledFormControl()) { if (form() && m_type == SUBMIT) { m_isActivatedSubmit = true; form()->prepareForSubmission(event); @@ -159,7 +155,7 @@ void HTMLButtonElement::defaultEventHandler(Event* event) bool HTMLButtonElement::willRespondToMouseClickEvents() { - if (!disabled() && form() && (m_type == SUBMIT || m_type == RESET)) + if (!isDisabledFormControl() && form() && (m_type == SUBMIT || m_type == RESET)) return true; return HTMLFormControlElement::willRespondToMouseClickEvents(); } @@ -168,7 +164,7 @@ bool HTMLButtonElement::isSuccessfulSubmitButton() const { // HTML spec says that buttons must have names to be considered successful. // However, other browsers do not impose this constraint. - return m_type == SUBMIT && !disabled(); + return m_type == SUBMIT && !isDisabledFormControl(); } bool HTMLButtonElement::isActivatedSubmit() const |