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

Side by Side Diff: Source/core/rendering/style/StyleMultiColData.cpp

Issue 201573009: Remove -webkit-column-progression and -webkit-column-axis properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master (fixed the DOS-style line break issue there) Created 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/style/StyleMultiColData.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
(...skipping 21 matching lines...) Expand all
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(RenderStyle::initialColumnFill()) 37 , m_fill(RenderStyle::initialColumnFill())
38 , m_columnSpan(false) 38 , m_columnSpan(false)
39 , m_breakBefore(RenderStyle::initialPageBreak()) 39 , m_breakBefore(RenderStyle::initialPageBreak())
40 , m_breakAfter(RenderStyle::initialPageBreak()) 40 , m_breakAfter(RenderStyle::initialPageBreak())
41 , m_breakInside(RenderStyle::initialPageBreak()) 41 , m_breakInside(RenderStyle::initialPageBreak())
42 , m_axis(RenderStyle::initialColumnAxis())
43 , m_progression(RenderStyle::initialColumnProgression())
44 { 42 {
45 } 43 }
46 44
47 StyleMultiColData::StyleMultiColData(const StyleMultiColData& o) 45 StyleMultiColData::StyleMultiColData(const StyleMultiColData& o)
48 : RefCounted<StyleMultiColData>() 46 : RefCounted<StyleMultiColData>()
49 , m_width(o.m_width) 47 , m_width(o.m_width)
50 , m_count(o.m_count) 48 , m_count(o.m_count)
51 , m_gap(o.m_gap) 49 , m_gap(o.m_gap)
52 , m_rule(o.m_rule) 50 , m_rule(o.m_rule)
53 , m_visitedLinkColumnRuleColor(o.m_visitedLinkColumnRuleColor) 51 , m_visitedLinkColumnRuleColor(o.m_visitedLinkColumnRuleColor)
54 , m_autoWidth(o.m_autoWidth) 52 , m_autoWidth(o.m_autoWidth)
55 , m_autoCount(o.m_autoCount) 53 , m_autoCount(o.m_autoCount)
56 , m_normalGap(o.m_normalGap) 54 , m_normalGap(o.m_normalGap)
57 , m_fill(o.m_fill) 55 , m_fill(o.m_fill)
58 , m_columnSpan(o.m_columnSpan) 56 , m_columnSpan(o.m_columnSpan)
59 , m_breakBefore(o.m_breakBefore) 57 , m_breakBefore(o.m_breakBefore)
60 , m_breakAfter(o.m_breakAfter) 58 , m_breakAfter(o.m_breakAfter)
61 , m_breakInside(o.m_breakInside) 59 , m_breakInside(o.m_breakInside)
62 , m_axis(o.m_axis)
63 , m_progression(o.m_progression)
64 { 60 {
65 } 61 }
66 62
67 bool StyleMultiColData::operator==(const StyleMultiColData& o) const 63 bool StyleMultiColData::operator==(const StyleMultiColData& o) const
68 { 64 {
69 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
70 && 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
71 && 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
72 && m_fill == o.m_fill && m_columnSpan == o.m_columnSpan 68 && m_fill == o.m_fill && m_columnSpan == o.m_columnSpan
73 && m_breakAfter == o.m_breakAfter && m_breakInside == o.m_breakInside 69 && m_breakAfter == o.m_breakAfter && m_breakInside == o.m_breakInside;
74 && m_axis == o.m_axis && m_progression == o.m_progression;
75 } 70 }
76 71
77 } // namespace WebCore 72 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleMultiColData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698