diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/html/shadow/ProgressShadowElement.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/html/shadow/ProgressShadowElement.cpp')
| -rw-r--r-- | Source/WebCore/html/shadow/ProgressShadowElement.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Source/WebCore/html/shadow/ProgressShadowElement.cpp b/Source/WebCore/html/shadow/ProgressShadowElement.cpp index 112e77814..e23ac216b 100644 --- a/Source/WebCore/html/shadow/ProgressShadowElement.cpp +++ b/Source/WebCore/html/shadow/ProgressShadowElement.cpp @@ -29,7 +29,6 @@ */ #include "config.h" -#if ENABLE(PROGRESS_ELEMENT) #include "ProgressShadowElement.h" #include "HTMLNames.h" @@ -47,7 +46,7 @@ ProgressShadowElement::ProgressShadowElement(Document& document) HTMLProgressElement* ProgressShadowElement::progressElement() const { - return toHTMLProgressElement(shadowHost()); + return downcast<HTMLProgressElement>(shadowHost()); } bool ProgressShadowElement::rendererIsNeeded(const RenderStyle& style) @@ -61,16 +60,13 @@ ProgressInnerElement::ProgressInnerElement(Document& document) { } -RenderPtr<RenderElement> ProgressInnerElement::createElementRenderer(PassRef<RenderStyle> style) +RenderPtr<RenderElement> ProgressInnerElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&) { - return createRenderer<RenderProgress>(*this, std::move(style)); + return createRenderer<RenderProgress>(*this, WTFMove(style)); } bool ProgressInnerElement::rendererIsNeeded(const RenderStyle& style) { - if (progressElement()->hasAuthorShadowRoot()) - return HTMLDivElement::rendererIsNeeded(style); - RenderObject* progressRenderer = progressElement()->renderer(); return progressRenderer && !progressRenderer->style().hasAppearance() && HTMLDivElement::rendererIsNeeded(style); } @@ -91,4 +87,3 @@ void ProgressValueElement::setWidthPercentage(double width) } } -#endif |