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

Unified Diff: trunk/Source/core/layout/MultiColumnFragmentainerGroup.cpp

Issue 948053002: Revert 190605 "Make RenderObject::style() return a const object" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 5 years, 10 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: trunk/Source/core/layout/MultiColumnFragmentainerGroup.cpp
===================================================================
--- trunk/Source/core/layout/MultiColumnFragmentainerGroup.cpp (revision 190671)
+++ trunk/Source/core/layout/MultiColumnFragmentainerGroup.cpp (working copy)
@@ -306,11 +306,11 @@
LayoutUnit MultiColumnFragmentainerGroup::calculateMaxColumnHeight() const
{
RenderBlockFlow* multicolBlock = m_columnSet.multiColumnBlockFlow();
- const LayoutStyle& multicolStyle = multicolBlock->styleRef();
+ LayoutStyle* multicolStyle = multicolBlock->style();
LayoutUnit availableHeight = m_columnSet.multiColumnFlowThread()->columnHeightAvailable();
LayoutUnit maxColumnHeight = availableHeight ? availableHeight : LayoutFlowThread::maxLogicalHeight();
- if (!multicolStyle.logicalMaxHeight().isMaxSizeNone()) {
- LayoutUnit logicalMaxHeight = multicolBlock->computeContentLogicalHeight(multicolStyle.logicalMaxHeight(), -1);
+ if (!multicolStyle->logicalMaxHeight().isMaxSizeNone()) {
+ LayoutUnit logicalMaxHeight = multicolBlock->computeContentLogicalHeight(multicolStyle->logicalMaxHeight(), -1);
if (logicalMaxHeight != -1 && maxColumnHeight > logicalMaxHeight)
maxColumnHeight = logicalMaxHeight;
}
« no previous file with comments | « trunk/Source/core/layout/LayoutTextControlSingleLine.cpp ('k') | trunk/Source/core/layout/line/BreakingContextInlineHeaders.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698