Source/core/layout/MultiColumnFragmentainerGroup.cpp - Issue 1033943002: Rename LayoutStyle to papayawhip

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: ensureComputedStyle Created 5 years, 9 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/core/layout/MultiColumnFragmentainerGroup.cpp

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

index b16f84a148345ab4e6352979465e08850b481787..6e97437889fc5918b95939719b7f26e59ab8388a 100644

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

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

@@ -333,7 +333,7 @@ LayoutUnit MultiColumnFragmentainerGroup::heightAdjustedForRowOffset(LayoutUnit

LayoutUnit MultiColumnFragmentainerGroup::calculateMaxColumnHeight() const

{

LayoutBlockFlow* multicolBlock = m_columnSet.multiColumnBlockFlow();

- const LayoutStyle& multicolStyle = multicolBlock->styleRef();

+ const ComputedStyle& multicolStyle = multicolBlock->styleRef();

LayoutUnit availableHeight = m_columnSet.multiColumnFlowThread()->columnHeightAvailable();

LayoutUnit maxColumnHeight = availableHeight ? availableHeight : LayoutFlowThread::maxLogicalHeight();

if (!multicolStyle.logicalMaxHeight().isMaxSizeNone()) {