third_party/WebKit/Source/core/layout/LayoutImage.cpp - Issue 1634133003: Condense Image::hasRelative{Width,Height}() into one

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

Issue 1634133003: Condense Image::hasRelative{Width,Height}() into one (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/html/HTMLImageElement.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutImageResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutImage.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutImage.cpp b/third_party/WebKit/Source/core/layout/LayoutImage.cpp

index 3b19099cce7b1dd8fe345ccdd87068ffb69bb2a8..1671f5d793b3d035b3bef75919555749bd6e8917 100644

--- a/third_party/WebKit/Source/core/layout/LayoutImage.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutImage.cpp

@@ -289,7 +289,7 @@ void LayoutImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, dou

LayoutReplaced::computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio);

// Our intrinsicSize is empty if we're laying out generated images with relative width/height. Figure out the right intrinsic size to use.

- if (intrinsicSize.isEmpty() && (m_imageResource->imageHasRelativeWidth() || m_imageResource->imageHasRelativeHeight())) {

+ if (intrinsicSize.isEmpty() && m_imageResource->imageHasRelativeSize()) {

LayoutObject* containingBlock = isOutOfFlowPositioned() ? container() : this->containingBlock();

if (containingBlock->isBox()) {

LayoutBox* box = toLayoutBox(containingBlock);