Source/core/layout/LayoutBlockFlowLine.cpp - Issue 1122323002: Cleanup: Remove LayoutRegion.

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/layout/LayoutBlockFlowLine.cpp

Issue 1122323002: Cleanup: Remove LayoutRegion. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: rebase master Created 5 years, 7 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/layout/LayoutBlockFlowLine.cpp

diff --git a/Source/core/layout/LayoutBlockFlowLine.cpp b/Source/core/layout/LayoutBlockFlowLine.cpp

index 026dfc368696d0e63ac37a88526d786e8a397239..f50503df8f4ac7314d450abc495ec79108cc2260 100644

--- a/Source/core/layout/LayoutBlockFlowLine.cpp

+++ b/Source/core/layout/LayoutBlockFlowLine.cpp

@@ -28,7 +28,6 @@

#include "core/layout/LayoutFlowThread.h"

#include "core/layout/LayoutListMarker.h"

#include "core/layout/LayoutObject.h"

-#include "core/layout/LayoutRegion.h"

#include "core/layout/LayoutRubyRun.h"

#include "core/layout/LayoutView.h"

#include "core/layout/TextRunConstructor.h"

@@ -1521,7 +1520,7 @@ void LayoutBlockFlow::computeInlinePreferredLogicalWidths(LayoutUnit& minLogical

void LayoutBlockFlow::layoutInlineChildren(bool relayoutChildren, LayoutUnit& paintInvalidationLogicalTop, LayoutUnit& paintInvalidationLogicalBottom, LayoutUnit afterEdge)

{

LayoutFlowThread* flowThread = flowThreadContainingBlock();

- bool clearLinesForPagination = firstLineBox() && flowThread && !flowThread->hasRegions();

+ bool clearLinesForPagination = firstLineBox() && flowThread && !flowThread->hasColumnSets();

// Figure out if we should clear out our line boxes.

// FIXME: Handle resize eventually!

« no previous file with comments | « Source/core/layout/LayoutBlockFlow.cpp ('k') | Source/core/layout/LayoutBoxModelObject.cpp » ('j') | no next file with comments »