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

Side by Side 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, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/layout/style/StyleMultiColData.h" 23 #include "core/layout/style/StyleMultiColData.h"
24 24
25 #include "core/layout/style/LayoutStyle.h" 25 #include "core/layout/style/ComputedStyle.h"
26 26
27 namespace blink { 27 namespace blink {
28 28
29 StyleMultiColData::StyleMultiColData() 29 StyleMultiColData::StyleMultiColData()
30 : m_width(0) 30 : m_width(0)
31 , m_count(LayoutStyle::initialColumnCount()) 31 , m_count(ComputedStyle::initialColumnCount())
32 , m_gap(0) 32 , m_gap(0)
33 , m_visitedLinkColumnRuleColor(StyleColor::currentColor()) 33 , m_visitedLinkColumnRuleColor(StyleColor::currentColor())
34 , m_autoWidth(true) 34 , m_autoWidth(true)
35 , m_autoCount(true) 35 , m_autoCount(true)
36 , m_normalGap(true) 36 , m_normalGap(true)
37 , m_fill(LayoutStyle::initialColumnFill()) 37 , m_fill(ComputedStyle::initialColumnFill())
38 , m_columnSpan(false) 38 , m_columnSpan(false)
39 , m_breakBefore(LayoutStyle::initialPageBreak()) 39 , m_breakBefore(ComputedStyle::initialPageBreak())
40 , m_breakAfter(LayoutStyle::initialPageBreak()) 40 , m_breakAfter(ComputedStyle::initialPageBreak())
41 , m_breakInside(LayoutStyle::initialPageBreak()) 41 , m_breakInside(ComputedStyle::initialPageBreak())
42 { 42 {
43 } 43 }
44 44
45 StyleMultiColData::StyleMultiColData(const StyleMultiColData& o) 45 StyleMultiColData::StyleMultiColData(const StyleMultiColData& o)
46 : RefCounted<StyleMultiColData>() 46 : RefCounted<StyleMultiColData>()
47 , m_width(o.m_width) 47 , m_width(o.m_width)
48 , m_count(o.m_count) 48 , m_count(o.m_count)
49 , m_gap(o.m_gap) 49 , m_gap(o.m_gap)
50 , m_rule(o.m_rule) 50 , m_rule(o.m_rule)
51 , m_visitedLinkColumnRuleColor(o.m_visitedLinkColumnRuleColor) 51 , m_visitedLinkColumnRuleColor(o.m_visitedLinkColumnRuleColor)
(...skipping 11 matching lines...) Expand all
63 bool StyleMultiColData::operator==(const StyleMultiColData& o) const 63 bool StyleMultiColData::operator==(const StyleMultiColData& o) const
64 { 64 {
65 return m_width == o.m_width && m_count == o.m_count && m_gap == o.m_gap 65 return m_width == o.m_width && m_count == o.m_count && m_gap == o.m_gap
66 && m_rule == o.m_rule && m_visitedLinkColumnRuleColor == o.m_visitedLink ColumnRuleColor && m_breakBefore == o.m_breakBefore 66 && m_rule == o.m_rule && m_visitedLinkColumnRuleColor == o.m_visitedLink ColumnRuleColor && m_breakBefore == o.m_breakBefore
67 && m_autoWidth == o.m_autoWidth && m_autoCount == o.m_autoCount && m_nor malGap == o.m_normalGap 67 && m_autoWidth == o.m_autoWidth && m_autoCount == o.m_autoCount && m_nor malGap == o.m_normalGap
68 && m_fill == o.m_fill && m_columnSpan == o.m_columnSpan 68 && m_fill == o.m_fill && m_columnSpan == o.m_columnSpan
69 && m_breakAfter == o.m_breakAfter && m_breakInside == o.m_breakInside; 69 && m_breakAfter == o.m_breakAfter && m_breakInside == o.m_breakInside;
70 } 70 }
71 71
72 } // namespace blink 72 } // namespace blink
OLDNEW
« 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