third_party/WebKit/Source/core/style/StyleGeneratedImage.h - Issue 1704493002: Use Image::updateConcreteSize()

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/style/StyleGeneratedImage.h

Issue 1704493002: Use Image::updateConcreteSize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-image-updateconcretesize

Patch Set: Move test here from dependency CL. Created 4 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 | « third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp ('k') | third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/style/StyleGeneratedImage.h

diff --git a/third_party/WebKit/Source/core/style/StyleGeneratedImage.h b/third_party/WebKit/Source/core/style/StyleGeneratedImage.h

index 17a4cddb898e437dcfff86a155a815a4d16c8a12..0b6848ccfe6cf8c7700ee968896a98d895d92bb2 100644

--- a/third_party/WebKit/Source/core/style/StyleGeneratedImage.h

+++ b/third_party/WebKit/Source/core/style/StyleGeneratedImage.h

@@ -44,6 +44,7 @@ public:

PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;

PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override;

+ void updateConcreteObjectSize(const LayoutSize& defaultObjectSize) override;

LayoutSize imageSize(const LayoutObject*, float multiplier) const override;

bool imageHasRelativeSize() const override { return !m_fixedSize; }

void computeIntrinsicDimensions(const LayoutObject*, FloatSize& intrinsicSize, FloatSize& intrinsicRatio) override;

@@ -62,6 +63,9 @@ private:

// supports const types.

RefPtrWillBeMember<CSSImageGeneratorValue> m_imageGeneratorValue;

const bool m_fixedSize;

+ // In case there's no fixed size, the default object size is used.

+ LayoutSize m_defaultObjectSize;

};

DEFINE_STYLE_IMAGE_TYPE_CASTS(StyleGeneratedImage, isGeneratedImage());