Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(934)

Unified Diff: Source/core/html/HTMLProgressElement.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLProgressElement.h ('k') | Source/core/html/HTMLRTElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLProgressElement.cpp
diff --git a/Source/core/html/HTMLProgressElement.cpp b/Source/core/html/HTMLProgressElement.cpp
index 430311057f4c02eacec36da2324fef7b80513ea9..5cb56b1376c9784e47cced32b98081b07b8d533b 100644
--- a/Source/core/html/HTMLProgressElement.cpp
+++ b/Source/core/html/HTMLProgressElement.cpp
@@ -58,11 +58,10 @@ PassRefPtrWillBeRawPtr<HTMLProgressElement> HTMLProgressElement::create(Document
return progress.release();
}
-RenderObject* HTMLProgressElement::createRenderer(const RenderStyle& style)
+LayoutObject* HTMLProgressElement::createRenderer(const RenderStyle& style)
{
if (!style.hasAppearance() || hasAuthorShadowRoot())
- return RenderObject::createObject(this, style);
-
+ return LayoutObject::createObject(this, style);
return new RenderProgress(this);
}
@@ -71,9 +70,9 @@ RenderProgress* HTMLProgressElement::renderProgress() const
if (renderer() && renderer()->isProgress())
return toRenderProgress(renderer());
- RenderObject* renderObject = userAgentShadowRoot()->firstChild()->renderer();
- ASSERT_WITH_SECURITY_IMPLICATION(!renderObject || renderObject->isProgress());
- return toRenderProgress(renderObject);
+ LayoutObject* layoutObject = userAgentShadowRoot()->firstChild()->renderer();
+ ASSERT_WITH_SECURITY_IMPLICATION(!layoutObject || layoutObject->isProgress());
+ return toRenderProgress(layoutObject);
}
void HTMLProgressElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
« no previous file with comments | « Source/core/html/HTMLProgressElement.h ('k') | Source/core/html/HTMLRTElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698