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

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:

Index: Source/WebCore/rendering/RenderBox.cpp

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

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

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

@@ -2283,7 +2283,7 @@

// height since we don't set a height in RenderView when we're printing. So without this quirk, the

// height has nothing to be a percentage of, and it ends up being 0. That is bad.

bool paginatedContentNeedsBaseHeight = document()->printing() && h.isPercent()

- && (isRoot() || (isBody() && document()->documentElement()->renderer()->style()->logicalHeight().isPercent()));

+ && (isRoot() || (isBody() && document()->documentElement()->renderer()->style()->logicalHeight().isPercent())) && !isInline();

if (stretchesToViewport() || paginatedContentNeedsBaseHeight) {

// FIXME: Finish accounting for block flow here.

// https://bugs.webkit.org/show_bug.cgi?id=46603

« no previous file with comments | « Source/WebCore/rendering/RenderBox.h ('k') | no next file » | no next file with comments »