Source/WebCore/rendering/RenderBox.h - Issue 12315018: Merge 142816

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: Source/WebCore/rendering/RenderBox.h

Issue 12315018: Merge 142816 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

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

Index: Source/WebCore/rendering/RenderBox.h

===================================================================

--- Source/WebCore/rendering/RenderBox.h (revision 143508)

+++ Source/WebCore/rendering/RenderBox.h (working copy)

@@ -395,7 +395,7 @@

bool stretchesToViewport() const

{

- return document()->inQuirksMode() && style()->logicalHeight().isAuto() && !isFloatingOrOutOfFlowPositioned() && (isRoot() || isBody()) && !document()->shouldDisplaySeamlesslyWithParent();

+ return document()->inQuirksMode() && style()->logicalHeight().isAuto() && !isFloatingOrOutOfFlowPositioned() && (isRoot() || isBody()) && !document()->shouldDisplaySeamlesslyWithParent() && !isInline();

}

virtual LayoutSize intrinsicSize() const { return LayoutSize(); }

« no previous file with comments | « LayoutTests/fast/block/body-inline-block-crash-expected.txt ('k') | Source/WebCore/rendering/RenderBox.cpp » ('j') | no next file with comments »