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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutImageResource.h

Issue 1427943002: Wrap SVGImage for container during paint (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use IntSize for SVGImageForContainer Created 5 years, 1 month 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: third_party/WebKit/Source/core/layout/LayoutImageResource.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutImageResource.h b/third_party/WebKit/Source/core/layout/LayoutImageResource.h
index 788e7949e0c5a5794722c6dc6fff3752b5f068cd..556dfe827b6701a673bd88793178ab4e83297a35 100644
--- a/third_party/WebKit/Source/core/layout/LayoutImageResource.h
+++ b/third_party/WebKit/Source/core/layout/LayoutImageResource.h
@@ -55,18 +55,13 @@ public:
void resetAnimation();
bool maybeAnimated() const;
- virtual PassRefPtr<Image> image(const IntSize&) const
- {
- return m_cachedImage ? m_cachedImage->imageForLayoutObject(m_layoutObject) : Image::nullImage();
- }
+ virtual PassRefPtr<Image> image(const IntSize&, float) const;
virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage->errorOccurred(); }
- virtual void setContainerSizeForLayoutObject(const IntSize&);
virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cachedImage->imageHasRelativeWidth() : false; }
virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cachedImage->imageHasRelativeHeight() : false; }
- virtual LayoutSize imageSize(float multiplier) const { return getImageSize(multiplier, ImageResource::NormalSize); }
- virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSize(multiplier, ImageResource::IntrinsicSize); }
+ virtual LayoutSize imageSize(float multiplier) const;
virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }
@@ -76,9 +71,6 @@ protected:
LayoutImageResource();
LayoutObject* m_layoutObject;
ResourcePtr<ImageResource> m_cachedImage;
-
-private:
- LayoutSize getImageSize(float multiplier, ImageResource::SizeType) const;
};
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutImage.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutImageResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698