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

Unified Diff: Source/core/editing/Editor.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/core.gypi ('k') | Source/core/editing/iterators/TextIterator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/Editor.cpp
diff --git a/Source/core/editing/Editor.cpp b/Source/core/editing/Editor.cpp
index a40592a17e0d8754c68d77efcc9604fe5d5bfb5c..b422792bab0690a0b33e8314779c56b171c3f8d7 100644
--- a/Source/core/editing/Editor.cpp
+++ b/Source/core/editing/Editor.cpp
@@ -74,12 +74,12 @@
#include "core/html/HTMLTextAreaElement.h"
#include "core/html/parser/HTMLParserIdioms.h"
#include "core/layout/HitTestResult.h"
+#include "core/layout/LayoutImage.h"
#include "core/loader/EmptyClients.h"
#include "core/page/EditorClient.h"
#include "core/page/EventHandler.h"
#include "core/page/FocusController.h"
#include "core/page/Page.h"
-#include "core/rendering/RenderImage.h"
#include "core/svg/SVGImageElement.h"
#include "platform/KillRing.h"
#include "platform/weborigin/KURL.h"
@@ -427,14 +427,14 @@ static PassRefPtr<Image> imageFromNode(const Node& node)
return toHTMLCanvasElement(node).copiedImage(FrontBuffer);
if (renderer->isImage()) {
- RenderImage* renderImage = toRenderImage(renderer);
- if (!renderImage)
+ LayoutImage* layoutImage = toLayoutImage(renderer);
+ if (!layoutImage)
return nullptr;
- ImageResource* cachedImage = renderImage->cachedImage();
+ ImageResource* cachedImage = layoutImage->cachedImage();
if (!cachedImage || cachedImage->errorOccurred())
return nullptr;
- return cachedImage->imageForRenderer(renderImage);
+ return cachedImage->imageForRenderer(layoutImage);
}
return nullptr;
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/editing/iterators/TextIterator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698