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

Unified Diff: Source/core/rendering/style/StyleFetchedImage.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
« no previous file with comments | « Source/core/rendering/style/StyleFetchedImage.h ('k') | Source/core/rendering/style/StyleFetchedImageSet.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/StyleFetchedImage.cpp
diff --git a/Source/core/rendering/style/StyleFetchedImage.cpp b/Source/core/rendering/style/StyleFetchedImage.cpp
index 86baaf6fa7cc5309c03aabf2c2f9af2b19ce55f5..0dc2c068503e27b3528f3d95faf6fe7a319b104a 100644
--- a/Source/core/rendering/style/StyleFetchedImage.cpp
+++ b/Source/core/rendering/style/StyleFetchedImage.cpp
@@ -26,7 +26,7 @@
#include "core/css/CSSImageValue.h"
#include "core/fetch/ImageResource.h"
-#include "core/rendering/RenderObject.h"
+#include "core/layout/LayoutObject.h"
namespace blink {
@@ -47,7 +47,7 @@ PassRefPtrWillBeRawPtr<CSSValue> StyleFetchedImage::cssValue() const
return CSSImageValue::create(m_image->url(), const_cast<StyleFetchedImage*>(this));
}
-bool StyleFetchedImage::canRender(const RenderObject& renderer, float multiplier) const
+bool StyleFetchedImage::canRender(const LayoutObject& renderer, float multiplier) const
{
return m_image->canRender(renderer, multiplier);
}
@@ -62,7 +62,7 @@ bool StyleFetchedImage::errorOccurred() const
return m_image->errorOccurred();
}
-LayoutSize StyleFetchedImage::imageSize(const RenderObject* renderer, float multiplier) const
+LayoutSize StyleFetchedImage::imageSize(const LayoutObject* renderer, float multiplier) const
{
return m_image->imageSizeForRenderer(renderer, multiplier);
}
@@ -77,7 +77,7 @@ bool StyleFetchedImage::imageHasRelativeHeight() const
return m_image->imageHasRelativeHeight();
}
-void StyleFetchedImage::computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
+void StyleFetchedImage::computeIntrinsicDimensions(const LayoutObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
{
m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
}
@@ -87,27 +87,27 @@ bool StyleFetchedImage::usesImageContainerSize() const
return m_image->usesImageContainerSize();
}
-void StyleFetchedImage::setContainerSizeForRenderer(const RenderObject* renderer, const IntSize& imageContainerSize, float imageContainerZoomFactor)
+void StyleFetchedImage::setContainerSizeForRenderer(const LayoutObject* renderer, const IntSize& imageContainerSize, float imageContainerZoomFactor)
{
m_image->setContainerSizeForRenderer(renderer, imageContainerSize, imageContainerZoomFactor);
}
-void StyleFetchedImage::addClient(RenderObject* renderer)
+void StyleFetchedImage::addClient(LayoutObject* renderer)
{
m_image->addClient(renderer);
}
-void StyleFetchedImage::removeClient(RenderObject* renderer)
+void StyleFetchedImage::removeClient(LayoutObject* renderer)
{
m_image->removeClient(renderer);
}
-PassRefPtr<Image> StyleFetchedImage::image(RenderObject* renderer, const IntSize&) const
+PassRefPtr<Image> StyleFetchedImage::image(LayoutObject* renderer, const IntSize&) const
{
return m_image->imageForRenderer(renderer);
}
-bool StyleFetchedImage::knownToBeOpaque(const RenderObject* renderer) const
+bool StyleFetchedImage::knownToBeOpaque(const LayoutObject* renderer) const
{
return m_image->currentFrameKnownToBeOpaque(renderer);
}
« no previous file with comments | « Source/core/rendering/style/StyleFetchedImage.h ('k') | Source/core/rendering/style/StyleFetchedImageSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698