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

Unified Diff: Source/core/layout/style/StyleMultiColData.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/style/StyleMultiColData.h ('k') | Source/core/layout/style/StylePendingImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/style/StyleMultiColData.cpp
diff --git a/Source/core/layout/style/StyleMultiColData.cpp b/Source/core/layout/style/StyleMultiColData.cpp
index c1eddf7fd83b7b2c1728f92ec83ff056f5e6438c..525a71b08516656990a36e5bfccb2e8d9242033e 100644
--- a/Source/core/layout/style/StyleMultiColData.cpp
+++ b/Source/core/layout/style/StyleMultiColData.cpp
@@ -22,23 +22,23 @@
#include "config.h"
#include "core/layout/style/StyleMultiColData.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
namespace blink {
StyleMultiColData::StyleMultiColData()
: m_width(0)
- , m_count(LayoutStyle::initialColumnCount())
+ , m_count(ComputedStyle::initialColumnCount())
, m_gap(0)
, m_visitedLinkColumnRuleColor(StyleColor::currentColor())
, m_autoWidth(true)
, m_autoCount(true)
, m_normalGap(true)
- , m_fill(LayoutStyle::initialColumnFill())
+ , m_fill(ComputedStyle::initialColumnFill())
, m_columnSpan(false)
- , m_breakBefore(LayoutStyle::initialPageBreak())
- , m_breakAfter(LayoutStyle::initialPageBreak())
- , m_breakInside(LayoutStyle::initialPageBreak())
+ , m_breakBefore(ComputedStyle::initialPageBreak())
+ , m_breakAfter(ComputedStyle::initialPageBreak())
+ , m_breakInside(ComputedStyle::initialPageBreak())
{
}
« no previous file with comments | « Source/core/layout/style/StyleMultiColData.h ('k') | Source/core/layout/style/StylePendingImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698