diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebCore/html/HTMLProgressElement.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebCore/html/HTMLProgressElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLProgressElement.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/Source/WebCore/html/HTMLProgressElement.cpp b/Source/WebCore/html/HTMLProgressElement.cpp index 78bbde32b..600b185d0 100644 --- a/Source/WebCore/html/HTMLProgressElement.cpp +++ b/Source/WebCore/html/HTMLProgressElement.cpp @@ -25,10 +25,8 @@ #include "Attribute.h" #include "EventNames.h" #include "ExceptionCode.h" -#include "FormDataList.h" #include "NodeRenderingContext.h" #include "HTMLDivElement.h" -#include "HTMLFormElement.h" #include "HTMLNames.h" #include "HTMLParserIdioms.h" #include "ProgressShadowElement.h" @@ -43,8 +41,8 @@ using namespace HTMLNames; const double HTMLProgressElement::IndeterminatePosition = -1; const double HTMLProgressElement::InvalidPosition = -2; -HTMLProgressElement::HTMLProgressElement(const QualifiedName& tagName, Document* document, HTMLFormElement* form) - : HTMLFormControlElement(tagName, document, form) +HTMLProgressElement::HTMLProgressElement(const QualifiedName& tagName, Document* document) + : LabelableElement(tagName, document) { ASSERT(hasTagName(progressTag)); } @@ -53,9 +51,9 @@ HTMLProgressElement::~HTMLProgressElement() { } -PassRefPtr<HTMLProgressElement> HTMLProgressElement::create(const QualifiedName& tagName, Document* document, HTMLFormElement* form) +PassRefPtr<HTMLProgressElement> HTMLProgressElement::create(const QualifiedName& tagName, Document* document) { - RefPtr<HTMLProgressElement> progress = adoptRef(new HTMLProgressElement(tagName, document, form)); + RefPtr<HTMLProgressElement> progress = adoptRef(new HTMLProgressElement(tagName, document)); progress->createShadowSubtree(); return progress; } @@ -67,7 +65,7 @@ RenderObject* HTMLProgressElement::createRenderer(RenderArena* arena, RenderStyl bool HTMLProgressElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const { - return childContext.isOnEncapsulationBoundary() && HTMLElement::childShouldCreateRenderer(childContext); + return childContext.isOnUpperEncapsulationBoundary() && HTMLElement::childShouldCreateRenderer(childContext); } bool HTMLProgressElement::supportsFocus() const @@ -75,12 +73,6 @@ bool HTMLProgressElement::supportsFocus() const return Node::supportsFocus() && !disabled(); } -const AtomicString& HTMLProgressElement::formControlType() const -{ - DEFINE_STATIC_LOCAL(const AtomicString, progress, ("progress")); - return progress; -} - void HTMLProgressElement::parseAttribute(Attribute* attribute) { if (attribute->name() == valueAttr) @@ -88,12 +80,12 @@ void HTMLProgressElement::parseAttribute(Attribute* attribute) else if (attribute->name() == maxAttr) didElementStateChange(); else - HTMLFormControlElement::parseAttribute(attribute); + LabelableElement::parseAttribute(attribute); } void HTMLProgressElement::attach() { - HTMLFormControlElement::attach(); + LabelableElement::attach(); didElementStateChange(); } |