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

Unified Diff: Source/core/layout/style/ContentData.cpp

Issue 923953002: Move rendering/RenderImage* to layout/LayoutImage* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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/layout/shapes/ShapeOutsideInfo.cpp ('k') | Source/core/loader/ImageLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/style/ContentData.cpp
diff --git a/Source/core/layout/style/ContentData.cpp b/Source/core/layout/style/ContentData.cpp
index 4d0121865afc53e97b56169ee4c0552a2fcd0e86..03046f4538fb525ad8b114d9eb07e902bf4cdab1 100644
--- a/Source/core/layout/style/ContentData.cpp
+++ b/Source/core/layout/style/ContentData.cpp
@@ -23,10 +23,10 @@
#include "core/layout/style/ContentData.h"
#include "core/layout/LayoutCounter.h"
+#include "core/layout/LayoutImage.h"
+#include "core/layout/LayoutImageResource.h"
+#include "core/layout/LayoutImageResourceStyleImage.h"
#include "core/layout/style/LayoutStyle.h"
-#include "core/rendering/RenderImage.h"
-#include "core/rendering/RenderImageResource.h"
-#include "core/rendering/RenderImageResourceStyleImage.h"
#include "core/rendering/RenderQuote.h"
#include "core/rendering/RenderTextFragment.h"
@@ -68,12 +68,12 @@ PassOwnPtr<ContentData> ContentData::clone() const
LayoutObject* ImageContentData::createRenderer(Document& doc, LayoutStyle& pseudoStyle) const
{
- RenderImage* image = RenderImage::createAnonymous(&doc);
+ LayoutImage* image = LayoutImage::createAnonymous(&doc);
image->setPseudoStyle(&pseudoStyle);
if (m_image)
- image->setImageResource(RenderImageResourceStyleImage::create(m_image.get()));
+ image->setImageResource(LayoutImageResourceStyleImage::create(m_image.get()));
else
- image->setImageResource(RenderImageResource::create());
+ image->setImageResource(LayoutImageResource::create());
return image;
}
« no previous file with comments | « Source/core/layout/shapes/ShapeOutsideInfo.cpp ('k') | Source/core/loader/ImageLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698