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

Unified Diff: Source/core/layout/compositing/CompositedLayerMapping.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.cpp ('k') | Source/core/layout/shapes/ShapeOutsideInfo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/compositing/CompositedLayerMapping.cpp
diff --git a/Source/core/layout/compositing/CompositedLayerMapping.cpp b/Source/core/layout/compositing/CompositedLayerMapping.cpp
index ab08ac64e75878dfbbd1ec70d7aa9c93aa53718d..d9079803682d0aaa508b13d96e2ac4ead1e5bbf9 100644
--- a/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -40,6 +40,7 @@
#include "core/inspector/InspectorNodeIds.h"
#include "core/layout/FilterEffectRenderer.h"
#include "core/layout/LayerStackingNodeIterator.h"
+#include "core/layout/LayoutImage.h"
#include "core/layout/LayoutVideo.h"
#include "core/layout/compositing/LayerCompositor.h"
#include "core/layout/style/KeyframeList.h"
@@ -52,7 +53,6 @@
#include "core/paint/TransformRecorder.h"
#include "core/plugins/PluginView.h"
#include "core/rendering/RenderEmbeddedObject.h"
-#include "core/rendering/RenderImage.h"
#include "core/rendering/RenderPart.h"
#include "core/rendering/RenderView.h"
#include "platform/LengthFunctions.h"
@@ -1857,7 +1857,7 @@ bool CompositedLayerMapping::isDirectlyCompositedImage() const
if (m_owningLayer.hasBoxDecorationsOrBackground() || layoutObject->hasClip() || layoutObject->hasClipPath())
return false;
- RenderImage* imageRenderer = toRenderImage(layoutObject);
+ LayoutImage* imageRenderer = toLayoutImage(layoutObject);
if (ImageResource* cachedImage = imageRenderer->cachedImage()) {
if (!cachedImage->hasImage())
return false;
@@ -1885,7 +1885,7 @@ void CompositedLayerMapping::contentChanged(ContentChangeType changeType)
void CompositedLayerMapping::updateImageContents()
{
ASSERT(renderer()->isImage());
- RenderImage* imageRenderer = toRenderImage(renderer());
+ LayoutImage* imageRenderer = toLayoutImage(renderer());
ImageResource* cachedImage = imageRenderer->cachedImage();
if (!cachedImage)
« no previous file with comments | « Source/core/layout/LayoutObject.cpp ('k') | Source/core/layout/shapes/ShapeOutsideInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698