third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp - Issue 1720853002: Remove Image::computeIntrinsicDimensions()

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 1720853002: Remove Image::computeIntrinsicDimensions() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-and-use-updateconcretesize-upload

Patch Set: Avoid using the size of the error image. Null-check in ImageResource saved the day in previous patc… Created 4 years, 9 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/StyleGeneratedImage.h ('k') | third_party/WebKit/Source/core/style/StyleImage.h » ('j') | third_party/WebKit/Source/platform/graphics/GeneratedImage.h » ('J')
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 435b937aefae67419ea36cdd3d31aec4ecebd71e..80374c8496dda6159581c5613e14ed507f63dc1c 100644

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

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

@@ -57,14 +57,6 @@ LayoutSize StyleGeneratedImage::imageSize(const LayoutObject* layoutObject, floa

return defaultObjectSize;

}

-void StyleGeneratedImage::computeIntrinsicDimensions(const LayoutObject* layoutObject, FloatSize& intrinsicSize, FloatSize& intrinsicRatio)

- // At a zoom level of 1 the image is guaranteed to have an integer size.

- LayoutSize size = imageSize(layoutObject, 1, LayoutSize());

- ASSERT(size.fraction().isZero());

- intrinsicSize = intrinsicRatio = FloatSize(size);

void StyleGeneratedImage::addClient(LayoutObject* layoutObject)

{

m_imageGeneratorValue->addClient(layoutObject, IntSize());