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

Unified Diff: Source/core/rendering/style/StyleImage.h

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
Index: Source/core/rendering/style/StyleImage.h
diff --git a/Source/core/rendering/style/StyleImage.h b/Source/core/rendering/style/StyleImage.h
index 304b1232926705e3656f3c8c298b27536b9c9d33..54564b5a31cf82cf397816be7c6fa2dbde4616a3 100644
--- a/Source/core/rendering/style/StyleImage.h
+++ b/Source/core/rendering/style/StyleImage.h
@@ -36,7 +36,7 @@ namespace blink {
class ImageResource;
class CSSValue;
-class RenderObject;
+class LayoutObject;
typedef void* WrappedImagePtr;
@@ -51,21 +51,21 @@ public:
virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const = 0;
- virtual bool canRender(const RenderObject&, float /*multiplier*/) const { return true; }
+ virtual bool canRender(const LayoutObject&, float /*multiplier*/) const { return true; }
virtual bool isLoaded() const { return true; }
virtual bool errorOccurred() const { return false; }
- virtual LayoutSize imageSize(const RenderObject*, float multiplier) const = 0;
- virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) = 0;
+ virtual LayoutSize imageSize(const LayoutObject*, float multiplier) const = 0;
+ virtual void computeIntrinsicDimensions(const LayoutObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) = 0;
virtual bool imageHasRelativeWidth() const = 0;
virtual bool imageHasRelativeHeight() const = 0;
virtual bool usesImageContainerSize() const = 0;
- virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize&, float) = 0;
- virtual void addClient(RenderObject*) = 0;
- virtual void removeClient(RenderObject*) = 0;
- virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const = 0;
+ virtual void setContainerSizeForRenderer(const LayoutObject*, const IntSize&, float) = 0;
+ virtual void addClient(LayoutObject*) = 0;
+ virtual void removeClient(LayoutObject*) = 0;
+ virtual PassRefPtr<Image> image(LayoutObject*, const IntSize&) const = 0;
virtual WrappedImagePtr data() const = 0;
virtual float imageScaleFactor() const { return 1; }
- virtual bool knownToBeOpaque(const RenderObject*) const = 0;
+ virtual bool knownToBeOpaque(const LayoutObject*) const = 0;
virtual ImageResource* cachedImage() const { return 0; }
ALWAYS_INLINE bool isImageResource() const { return m_isImageResource; }
« no previous file with comments | « Source/core/rendering/style/StyleGeneratedImage.cpp ('k') | Source/core/rendering/style/StylePendingImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698