diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
| commit | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (patch) | |
| tree | b34b0daceb7c8e7fdde4b4ec43650ab7caadb0a9 /Source/WebCore/html/HTMLProgressElement.cpp | |
| parent | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (diff) | |
| download | qtwebkit-ad0d549d4cc13433f77c1ac8f0ab379c83d93f28.tar.gz | |
Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790)
Diffstat (limited to 'Source/WebCore/html/HTMLProgressElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLProgressElement.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLProgressElement.cpp b/Source/WebCore/html/HTMLProgressElement.cpp index 0c2372581..78bbde32b 100644 --- a/Source/WebCore/html/HTMLProgressElement.cpp +++ b/Source/WebCore/html/HTMLProgressElement.cpp @@ -26,6 +26,7 @@ #include "EventNames.h" #include "ExceptionCode.h" #include "FormDataList.h" +#include "NodeRenderingContext.h" #include "HTMLDivElement.h" #include "HTMLFormElement.h" #include "HTMLNames.h" @@ -64,6 +65,11 @@ RenderObject* HTMLProgressElement::createRenderer(RenderArena* arena, RenderStyl return new (arena) RenderProgress(this); } +bool HTMLProgressElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const +{ + return childContext.isOnEncapsulationBoundary() && HTMLElement::childShouldCreateRenderer(childContext); +} + bool HTMLProgressElement::supportsFocus() const { return Node::supportsFocus() && !disabled(); @@ -153,7 +159,7 @@ void HTMLProgressElement::didElementStateChange() void HTMLProgressElement::createShadowSubtree() { - ASSERT(!shadowRoot()); + ASSERT(!hasShadowRoot()); RefPtr<ProgressBarElement> bar = ProgressBarElement::create(document()); m_value = ProgressValueElement::create(document()); |