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

Unified Diff: Source/core/html/HTMLImageElement.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
Index: Source/core/html/HTMLImageElement.cpp
diff --git a/Source/core/html/HTMLImageElement.cpp b/Source/core/html/HTMLImageElement.cpp
index 9fe4683b2cd77ddaf3d6ae919f8266e20487b5a9..8a91b6e41245d5e8ceac50797a0bc091b9d56505 100644
--- a/Source/core/html/HTMLImageElement.cpp
+++ b/Source/core/html/HTMLImageElement.cpp
@@ -332,10 +332,10 @@ ImageCandidate HTMLImageElement::findBestFitImageFromPictureParent()
return ImageCandidate();
}
-RenderObject* HTMLImageElement::createRenderer(RenderStyle* style)
+LayoutObject* HTMLImageElement::createRenderer(RenderStyle* style)
{
if (style->hasContent())
- return RenderObject::createObject(this, style);
+ return LayoutObject::createObject(this, style);
if (m_useFallbackContent)
return new RenderBlockFlow(this);
@@ -523,7 +523,7 @@ void HTMLImageElement::setWidth(int value)
int HTMLImageElement::x() const
{
document().updateLayoutIgnorePendingStylesheets();
- RenderObject* r = renderer();
+ LayoutObject* r = renderer();
if (!r)
return 0;
@@ -535,7 +535,7 @@ int HTMLImageElement::x() const
int HTMLImageElement::y() const
{
document().updateLayoutIgnorePendingStylesheets();
- RenderObject* r = renderer();
+ LayoutObject* r = renderer();
if (!r)
return 0;

Powered by Google App Engine
This is Rietveld 408576698