Source/core/rendering/RenderBlock.cpp - Issue 129873004: RenderBlock::isSelfCollapsingBlock() should only be used when an object does not require layout.

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/core/rendering/RenderBlock.cpp

Issue 129873004: RenderBlock::isSelfCollapsingBlock() should only be used when an object does not require layout. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

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

Index: Source/core/rendering/RenderBlock.cpp

diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp

index 38838c1289af1a2f928bb616ffd4224e5833b54c..da462aa8be38bebb8113ac5f03268d46f14d3519 100644

--- a/Source/core/rendering/RenderBlock.cpp

+++ b/Source/core/rendering/RenderBlock.cpp

@@ -55,6 +55,7 @@

#include "core/rendering/RenderNamedFlowThread.h"

#include "core/rendering/RenderRegion.h"

#include "core/rendering/RenderTableCell.h"

+#include "core/rendering/RenderTextControl.h"

#include "core/rendering/RenderTextFragment.h"

#include "core/rendering/RenderTheme.h"

#include "core/rendering/RenderView.h"

@@ -1147,8 +1148,7 @@ void RenderBlock::removeChild(RenderObject* oldChild)

bool RenderBlock::isSelfCollapsingBlock() const

{

- // FIXME: Add ASSERT(!selfNeedsLayout()) when clearFloatsIfNeeded() and skipLeadingWhitespace() no

- // longer call here when the block requires layout.

+ ASSERT(!needsLayout());

// We are not self-collapsing if we

// (a) have a non-zero height according to layout (an optimization to avoid wasting time)

« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/rendering/RenderBlockFlow.h » ('j') | Source/core/rendering/RenderObject.cpp » ('J')