| Index: Source/core/html/HTMLProgressElement.cpp
|
| diff --git a/Source/core/html/HTMLProgressElement.cpp b/Source/core/html/HTMLProgressElement.cpp
|
| index 5d9765379cdef68c99b4c62a16f3505173fd82d5..6333ef9fa9521fb6094bdde29d5920f36f03e2c4 100644
|
| --- a/Source/core/html/HTMLProgressElement.cpp
|
| +++ b/Source/core/html/HTMLProgressElement.cpp
|
| @@ -31,7 +31,7 @@
|
| #include "core/frame/UseCounter.h"
|
| #include "core/html/parser/HTMLParserIdioms.h"
|
| #include "core/html/shadow/ProgressShadowElement.h"
|
| -#include "core/rendering/RenderProgress.h"
|
| +#include "core/layout/LayoutProgress.h"
|
|
|
| namespace blink {
|
|
|
| @@ -62,17 +62,17 @@ LayoutObject* HTMLProgressElement::createRenderer(const LayoutStyle& style)
|
| {
|
| if (!style.hasAppearance() || hasOpenShadowRoot())
|
| return LayoutObject::createObject(this, style);
|
| - return new RenderProgress(this);
|
| + return new LayoutProgress(this);
|
| }
|
|
|
| -RenderProgress* HTMLProgressElement::renderProgress() const
|
| +LayoutProgress* HTMLProgressElement::layoutProgress() const
|
| {
|
| if (renderer() && renderer()->isProgress())
|
| - return toRenderProgress(renderer());
|
| + return toLayoutProgress(renderer());
|
|
|
| LayoutObject* layoutObject = closedShadowRoot()->firstChild()->renderer();
|
| ASSERT_WITH_SECURITY_IMPLICATION(!layoutObject || layoutObject->isProgress());
|
| - return toRenderProgress(layoutObject);
|
| + return toLayoutProgress(layoutObject);
|
| }
|
|
|
| void HTMLProgressElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
|
| @@ -88,7 +88,7 @@ void HTMLProgressElement::parseAttribute(const QualifiedName& name, const Atomic
|
| void HTMLProgressElement::attach(const AttachContext& context)
|
| {
|
| LabelableElement::attach(context);
|
| - if (RenderProgress* render = renderProgress())
|
| + if (LayoutProgress* render = layoutProgress())
|
| render->updateFromElement();
|
| }
|
|
|
| @@ -138,7 +138,7 @@ bool HTMLProgressElement::isDeterminate() const
|
| void HTMLProgressElement::didElementStateChange()
|
| {
|
| m_value->setWidthPercentage(position() * 100);
|
| - if (RenderProgress* render = renderProgress()) {
|
| + if (LayoutProgress* render = layoutProgress()) {
|
| bool wasDeterminate = render->isDeterminate();
|
| render->updateFromElement();
|
| if (wasDeterminate != isDeterminate())
|
|
|