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

Unified Diff: Source/core/layout/LayoutObject.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/LayoutObject.h ('k') | Source/core/layout/compositing/CompositedLayerMapping.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutObject.cpp
diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp
index f6a549ff85bd87cf03a9ca1adbd9204fc05cd618..330f9a7ae549c3cc7fb9fe6129be413043ece7f1 100644
--- a/Source/core/layout/LayoutObject.cpp
+++ b/Source/core/layout/LayoutObject.cpp
@@ -53,6 +53,8 @@
#include "core/layout/LayoutCounter.h"
#include "core/layout/LayoutFlowThread.h"
#include "core/layout/LayoutGeometryMap.h"
+#include "core/layout/LayoutImage.h"
+#include "core/layout/LayoutImageResourceStyleImage.h"
#include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
#include "core/layout/LayoutObjectInlines.h"
#include "core/layout/LayoutTableCaption.h"
@@ -71,8 +73,6 @@
#include "core/rendering/RenderDeprecatedFlexibleBox.h"
#include "core/rendering/RenderFlexibleBox.h"
#include "core/rendering/RenderGrid.h"
-#include "core/rendering/RenderImage.h"
-#include "core/rendering/RenderImageResourceStyleImage.h"
#include "core/rendering/RenderInline.h"
#include "core/rendering/RenderListItem.h"
#include "core/rendering/RenderPart.h"
@@ -161,16 +161,16 @@ LayoutObject* LayoutObject::createObject(Element* element, const LayoutStyle& st
// Otherwise acts as if we didn't support this feature.
const ContentData* contentData = style.contentData();
if (contentData && !contentData->next() && contentData->isImage() && !element->isPseudoElement()) {
- RenderImage* image = new RenderImage(element);
- // RenderImageResourceStyleImage requires a style being present on the image but we don't want to
+ LayoutImage* image = new LayoutImage(element);
+ // LayoutImageResourceStyleImage requires a style being present on the image but we don't want to
// trigger a style change now as the node is not fully attached. Moving this code to style change
// doesn't make sense as it should be run once at renderer creation.
image->setStyleInternal(const_cast<LayoutStyle*>(&style));
if (const StyleImage* styleImage = toImageContentData(contentData)->image()) {
- image->setImageResource(RenderImageResourceStyleImage::create(const_cast<StyleImage*>(styleImage)));
+ image->setImageResource(LayoutImageResourceStyleImage::create(const_cast<StyleImage*>(styleImage)));
image->setIsGeneratedContent();
} else {
- image->setImageResource(RenderImageResource::create());
+ image->setImageResource(LayoutImageResource::create());
}
image->setStyleInternal(nullptr);
return image;
« no previous file with comments | « Source/core/layout/LayoutObject.h ('k') | Source/core/layout/compositing/CompositedLayerMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698