third_party/WebKit/Source/core/layout/LayoutImageResource.h - Issue 1367193003: NOT FOR LANDING Allocate SVGImageForContainer on demand

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1367193003: NOT FOR LANDING Allocate SVGImageForContainer on demand (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added some NeedsRebaseline and revived some LayoutListMarker code that turned out to be important Created 5 years, 2 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 | « third_party/WebKit/Source/core/layout/LayoutImage.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutImageResource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 4be4044bba8306679536a33da16a9776d99f24a1..9d5bba39485d40c6975678b729be7c34a88bdf5f 100644

--- a/third_party/WebKit/Source/core/layout/LayoutImageResource.h

+++ b/third_party/WebKit/Source/core/layout/LayoutImageResource.h

@@ -53,18 +53,15 @@ public:

virtual bool hasImage() const { return m_cachedImage; }

void resetAnimation();

+ bool maybeAnimated() const;

- virtual PassRefPtr<Image> image(int /* width */ = 0, int /* height */ = 0) const

- {

- return m_cachedImage ? m_cachedImage->imageForLayoutObject(m_layoutObject) : Image::nullImage();

- }

+ virtual PassRefPtr<Image> image(const IntSize&, float, const KURL&) 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 imageSize(float multiplier) const { return getImageSize(multiplier, ImageResource::IntrinsicSize); }

virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSize(multiplier, ImageResource::IntrinsicSize); }

virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }