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

Unified Diff: Source/core/layout/LayoutMultiColumnFlowThread.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/LayoutMultiColumnFlowThread.h ('k') | Source/core/layout/LayoutMultiColumnSet.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutMultiColumnFlowThread.cpp
diff --git a/Source/core/layout/LayoutMultiColumnFlowThread.cpp b/Source/core/layout/LayoutMultiColumnFlowThread.cpp
index cbd7f7df22eb4b1392629c76b8b4c0ca13892fd6..7707bbdf8cb47192251655d4677ad1d142fe6ae9 100644
--- a/Source/core/layout/LayoutMultiColumnFlowThread.cpp
+++ b/Source/core/layout/LayoutMultiColumnFlowThread.cpp
@@ -47,11 +47,11 @@ LayoutMultiColumnFlowThread::~LayoutMultiColumnFlowThread()
{
}
-LayoutMultiColumnFlowThread* LayoutMultiColumnFlowThread::createAnonymous(Document& document, const LayoutStyle& parentStyle)
+LayoutMultiColumnFlowThread* LayoutMultiColumnFlowThread::createAnonymous(Document& document, const ComputedStyle& parentStyle)
{
LayoutMultiColumnFlowThread* renderer = new LayoutMultiColumnFlowThread();
renderer->setDocumentForAnonymous(&document);
- renderer->setStyle(LayoutStyle::createAnonymousStyleWithDisplay(parentStyle, BLOCK));
+ renderer->setStyle(ComputedStyle::createAnonymousStyleWithDisplay(parentStyle, BLOCK));
return renderer;
}
@@ -314,7 +314,7 @@ void LayoutMultiColumnFlowThread::columnRuleStyleDidChange()
void LayoutMultiColumnFlowThread::calculateColumnCountAndWidth(LayoutUnit& width, unsigned& count) const
{
LayoutBlock* columnBlock = multiColumnBlockFlow();
- const LayoutStyle* columnStyle = columnBlock->style();
+ const ComputedStyle* columnStyle = columnBlock->style();
LayoutUnit availableWidth = columnBlock->contentLogicalWidth();
LayoutUnit columnGap = columnBlock->columnGap();
LayoutUnit computedColumnWidth = max<LayoutUnit>(1, LayoutUnit(columnStyle->columnWidth()));
@@ -595,7 +595,7 @@ void LayoutMultiColumnFlowThread::computePreferredLogicalWidths()
// laid out inside the columns. In order to eventually end up with the desired column width,
// we need to convert them to values pertaining to the multicol container.
const LayoutBlockFlow* multicolContainer = multiColumnBlockFlow();
- const LayoutStyle* multicolStyle = multicolContainer->style();
+ const ComputedStyle* multicolStyle = multicolContainer->style();
int columnCount = multicolStyle->hasAutoColumnCount() ? 1 : multicolStyle->columnCount();
LayoutUnit columnWidth;
LayoutUnit gapExtra = (columnCount - 1) * multicolContainer->columnGap();
« no previous file with comments | « Source/core/layout/LayoutMultiColumnFlowThread.h ('k') | Source/core/layout/LayoutMultiColumnSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698