third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp - Issue 1427943002: Wrap SVGImage for container during paint

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.cpp

Issue 1427943002: Wrap SVGImage for container during paint (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase 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

« third_party/WebKit/Source/core/paint/SVGImagePainter.cpp ('K') | « third_party/WebKit/Source/core/style/StyleGeneratedImage.h ('k') | third_party/WebKit/Source/core/style/StyleImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 690698217d05a56dab409131204a665914da7c81..68f95574f75d5c0bc805b39a93183350679508eb 100644

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

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

@@ -67,7 +67,7 @@ LayoutSize StyleGeneratedImage::imageSize(const LayoutObject* layoutObject, floa

return LayoutSize(width, height);

}

- return LayoutSize(m_containerSize);

+ return LayoutSize();

}

void StyleGeneratedImage::computeIntrinsicDimensions(const LayoutObject* layoutObject, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)

@@ -89,7 +89,7 @@ void StyleGeneratedImage::removeClient(LayoutObject* layoutObject)

m_imageGeneratorValue->removeClient(layoutObject);

}

-PassRefPtr<Image> StyleGeneratedImage::image(const LayoutObject* layoutObject, const IntSize& size) const

+PassRefPtr<Image> StyleGeneratedImage::image(const LayoutObject* layoutObject, const IntSize& size, float) const

{

return m_imageGeneratorValue->image(layoutObject, size);

}