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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 25687002: Add support for the column-fill property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master Created 7 years, 2 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
« Source/core/css/CSSProperties.in ('K') | « 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 15 matching lines...) Expand all
26 26
27 namespace WebCore { 27 namespace WebCore {
28 28
29 StyleMultiColData::StyleMultiColData() 29 StyleMultiColData::StyleMultiColData()
30 : m_width(0) 30 : m_width(0)
31 , m_count(RenderStyle::initialColumnCount()) 31 , m_count(RenderStyle::initialColumnCount())
32 , m_gap(0) 32 , m_gap(0)
33 , m_autoWidth(true) 33 , m_autoWidth(true)
34 , m_autoCount(true) 34 , m_autoCount(true)
35 , m_normalGap(true) 35 , m_normalGap(true)
36 , m_fill(RenderStyle::initialColumnFill())
36 , m_columnSpan(false) 37 , m_columnSpan(false)
37 , m_breakBefore(RenderStyle::initialPageBreak()) 38 , m_breakBefore(RenderStyle::initialPageBreak())
38 , m_breakAfter(RenderStyle::initialPageBreak()) 39 , m_breakAfter(RenderStyle::initialPageBreak())
39 , m_breakInside(RenderStyle::initialPageBreak()) 40 , m_breakInside(RenderStyle::initialPageBreak())
40 , m_axis(RenderStyle::initialColumnAxis()) 41 , m_axis(RenderStyle::initialColumnAxis())
41 , m_progression(RenderStyle::initialColumnProgression()) 42 , m_progression(RenderStyle::initialColumnProgression())
42 { 43 {
43 } 44 }
44 45
45 StyleMultiColData::StyleMultiColData(const StyleMultiColData& o) 46 StyleMultiColData::StyleMultiColData(const StyleMultiColData& o)
46 : RefCounted<StyleMultiColData>() 47 : RefCounted<StyleMultiColData>()
47 , m_width(o.m_width) 48 , m_width(o.m_width)
48 , m_count(o.m_count) 49 , m_count(o.m_count)
49 , m_gap(o.m_gap) 50 , m_gap(o.m_gap)
50 , m_rule(o.m_rule) 51 , m_rule(o.m_rule)
51 , m_visitedLinkColumnRuleColor(o.m_visitedLinkColumnRuleColor) 52 , m_visitedLinkColumnRuleColor(o.m_visitedLinkColumnRuleColor)
52 , m_autoWidth(o.m_autoWidth) 53 , m_autoWidth(o.m_autoWidth)
53 , m_autoCount(o.m_autoCount) 54 , m_autoCount(o.m_autoCount)
54 , m_normalGap(o.m_normalGap) 55 , m_normalGap(o.m_normalGap)
56 , m_fill(o.m_fill)
55 , m_columnSpan(o.m_columnSpan) 57 , m_columnSpan(o.m_columnSpan)
56 , m_breakBefore(o.m_breakBefore) 58 , m_breakBefore(o.m_breakBefore)
57 , m_breakAfter(o.m_breakAfter) 59 , m_breakAfter(o.m_breakAfter)
58 , m_breakInside(o.m_breakInside) 60 , m_breakInside(o.m_breakInside)
59 , m_axis(o.m_axis) 61 , m_axis(o.m_axis)
60 , m_progression(o.m_progression) 62 , m_progression(o.m_progression)
61 { 63 {
62 } 64 }
63 65
64 bool StyleMultiColData::operator==(const StyleMultiColData& o) const 66 bool StyleMultiColData::operator==(const StyleMultiColData& o) const
65 { 67 {
66 return m_width == o.m_width && m_count == o.m_count && m_gap == o.m_gap 68 return m_width == o.m_width && m_count == o.m_count && m_gap == o.m_gap
67 && m_rule == o.m_rule && m_visitedLinkColumnRuleColor == o.m_visitedL inkColumnRuleColor && m_breakBefore == o.m_breakBefore 69 && m_rule == o.m_rule && m_visitedLinkColumnRuleColor == o.m_visitedLink ColumnRuleColor && m_breakBefore == o.m_breakBefore
68 && m_autoWidth == o.m_autoWidth && m_autoCount == o.m_autoCount && m_ normalGap == o.m_normalGap 70 && m_autoWidth == o.m_autoWidth && m_autoCount == o.m_autoCount && m_nor malGap == o.m_normalGap
69 && m_columnSpan == o.m_columnSpan && m_breakAfter == o.m_breakAfter & & m_breakInside == o.m_breakInside && m_axis == o.m_axis 71 && m_fill == o.m_fill && m_columnSpan == o.m_columnSpan
70 && m_progression == o.m_progression; 72 && m_breakAfter == o.m_breakAfter && m_breakInside == o.m_breakInside
73 && m_axis == o.m_axis && m_progression == o.m_progression;
71 } 74 }
72 75
73 } // namespace WebCore 76 } // namespace WebCore
OLDNEW
« Source/core/css/CSSProperties.in ('K') | « Source/core/rendering/style/StyleMultiColData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698