third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp - Issue 1558133002: Soften assertion slightly, to survive saturated arithmetic situations.

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

Issue 1558133002: Soften assertion slightly, to survive saturated arithmetic situations. (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/LayoutTests/fast/multicol/short-columns-insane-unbreakable-content-height-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d72be73a51463b16d41c27f51a54ebdfeb10b149..4b3f00c2e21d8c46f5f7b6df64b98dffc6c7d5fa 100644

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

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

@@ -99,7 +99,7 @@ bool LayoutMultiColumnSet::isPageLogicalHeightKnown() const

LayoutUnit LayoutMultiColumnSet::nextLogicalTopForUnbreakableContent(LayoutUnit flowThreadOffset, LayoutUnit contentLogicalHeight) const

{

- ASSERT(pageLogicalTopForOffset(flowThreadOffset) == flowThreadOffset);

+ ASSERT(flowThreadOffset.mightBeSaturated() || pageLogicalTopForOffset(flowThreadOffset) == flowThreadOffset);

FragmentationContext* enclosingFragmentationContext = multiColumnFlowThread()->enclosingFragmentationContext();

if (!enclosingFragmentationContext) {

// If there's no enclosing fragmentation context, there'll ever be only one row, and all