Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1254)

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutView.cpp ('k') | Source/core/layout/MultiColumnFragmentainerGroupTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()) {
« no previous file with comments | « Source/core/layout/LayoutView.cpp ('k') | Source/core/layout/MultiColumnFragmentainerGroupTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698