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

Side by Side Diff: sky/engine/core/rendering/style/StyleRareInheritedData.cpp

Issue 1068073002: drop 'orphan' property (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fix ojan's comments 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
« no previous file with comments | « sky/engine/core/rendering/style/StyleRareInheritedData.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, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 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 25 matching lines...) Expand all
36 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI nheritedData> { 36 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI nheritedData> {
37 void* styleImage; 37 void* styleImage;
38 Color firstColor; 38 Color firstColor;
39 float firstFloat; 39 float firstFloat;
40 Color colors[2]; 40 Color colors[2];
41 void* ownPtrs[1]; 41 void* ownPtrs[1];
42 AtomicString atomicStrings[4]; 42 AtomicString atomicStrings[4];
43 void* refPtrs[3]; 43 void* refPtrs[3];
44 Length lengths[1]; 44 Length lengths[1];
45 unsigned m_bitfields[2]; 45 unsigned m_bitfields[2];
46 short pagedMediaShorts[2];
47 unsigned unsigneds[1]; 46 unsigned unsigneds[1];
47 short pagedMediaShorts[1];
48 short hyphenationShorts[3]; 48 short hyphenationShorts[3];
49 49
50 Color touchColors; 50 Color touchColors;
51 }; 51 };
52 52
53 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack); 53 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack);
54 54
55 StyleRareInheritedData::StyleRareInheritedData() 55 StyleRareInheritedData::StyleRareInheritedData()
56 : listStyleImage(RenderStyle::initialListStyleImage()) 56 : listStyleImage(RenderStyle::initialListStyleImage())
57 , textStrokeWidth(RenderStyle::initialTextStrokeWidth()) 57 , textStrokeWidth(RenderStyle::initialTextStrokeWidth())
58 , indent(RenderStyle::initialTextIndent()) 58 , indent(RenderStyle::initialTextIndent())
59 , widows(RenderStyle::initialWidows())
60 , orphans(RenderStyle::initialOrphans())
61 , m_hasAutoWidows(true)
62 , m_hasAutoOrphans(true)
63 , m_textStrokeColorIsCurrentColor(true) 59 , m_textStrokeColorIsCurrentColor(true)
64 , m_textFillColorIsCurrentColor(true) 60 , m_textFillColorIsCurrentColor(true)
65 , m_textEmphasisColorIsCurrentColor(true) 61 , m_textEmphasisColorIsCurrentColor(true)
66 , userModify(READ_ONLY) 62 , userModify(READ_ONLY)
67 , wordBreak(RenderStyle::initialWordBreak()) 63 , wordBreak(RenderStyle::initialWordBreak())
68 , overflowWrap(RenderStyle::initialOverflowWrap()) 64 , overflowWrap(RenderStyle::initialOverflowWrap())
69 , lineBreak(LineBreakAuto) 65 , lineBreak(LineBreakAuto)
70 , userSelect(RenderStyle::initialUserSelect()) 66 , userSelect(RenderStyle::initialUserSelect())
71 , speak(SpeakNormal) 67 , speak(SpeakNormal)
72 , hyphens(HyphensManual) 68 , hyphens(HyphensManual)
73 , textEmphasisFill(TextEmphasisFillFilled) 69 , textEmphasisFill(TextEmphasisFillFilled)
74 , textEmphasisMark(TextEmphasisMarkNone) 70 , textEmphasisMark(TextEmphasisMarkNone)
75 , textEmphasisPosition(TextEmphasisPositionOver) 71 , textEmphasisPosition(TextEmphasisPositionOver)
76 , m_textAlignLast(RenderStyle::initialTextAlignLast()) 72 , m_textAlignLast(RenderStyle::initialTextAlignLast())
77 , m_textJustify(RenderStyle::initialTextJustify()) 73 , m_textJustify(RenderStyle::initialTextJustify())
78 , m_textOrientation(TextOrientationVerticalRight) 74 , m_textOrientation(TextOrientationVerticalRight)
79 , m_textIndentLine(RenderStyle::initialTextIndentLine()) 75 , m_textIndentLine(RenderStyle::initialTextIndentLine())
80 , m_textIndentType(RenderStyle::initialTextIndentLine()) 76 , m_textIndentType(RenderStyle::initialTextIndentLine())
81 , m_lineBoxContain(RenderStyle::initialLineBoxContain()) 77 , m_lineBoxContain(RenderStyle::initialLineBoxContain())
82 , m_imageRendering(RenderStyle::initialImageRendering()) 78 , m_imageRendering(RenderStyle::initialImageRendering())
83 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) 79 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
84 , m_touchActionDelay(RenderStyle::initialTouchActionDelay()) 80 , m_touchActionDelay(RenderStyle::initialTouchActionDelay())
85 , m_subtreeWillChangeContents(false) 81 , m_subtreeWillChangeContents(false)
82 , m_hasAutoWidows(true)
83 , widows(RenderStyle::initialWidows())
86 , hyphenationLimitBefore(-1) 84 , hyphenationLimitBefore(-1)
87 , hyphenationLimitAfter(-1) 85 , hyphenationLimitAfter(-1)
88 , hyphenationLimitLines(-1) 86 , hyphenationLimitLines(-1)
89 , m_tabSize(RenderStyle::initialTabSize()) 87 , m_tabSize(RenderStyle::initialTabSize())
90 , tapHighlightColor(RenderStyle::initialTapHighlightColor()) 88 , tapHighlightColor(RenderStyle::initialTapHighlightColor())
91 { 89 {
92 } 90 }
93 91
94 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) 92 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
95 : RefCounted<StyleRareInheritedData>() 93 : RefCounted<StyleRareInheritedData>()
96 , listStyleImage(o.listStyleImage) 94 , listStyleImage(o.listStyleImage)
97 , m_textStrokeColor(o.m_textStrokeColor) 95 , m_textStrokeColor(o.m_textStrokeColor)
98 , textStrokeWidth(o.textStrokeWidth) 96 , textStrokeWidth(o.textStrokeWidth)
99 , m_textFillColor(o.m_textFillColor) 97 , m_textFillColor(o.m_textFillColor)
100 , m_textEmphasisColor(o.m_textEmphasisColor) 98 , m_textEmphasisColor(o.m_textEmphasisColor)
101 , textShadow(o.textShadow) 99 , textShadow(o.textShadow)
102 , highlight(o.highlight) 100 , highlight(o.highlight)
103 , cursorData(o.cursorData) 101 , cursorData(o.cursorData)
104 , indent(o.indent) 102 , indent(o.indent)
105 , widows(o.widows)
106 , orphans(o.orphans)
107 , m_hasAutoWidows(o.m_hasAutoWidows)
108 , m_hasAutoOrphans(o.m_hasAutoOrphans)
109 , m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor) 103 , m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor)
110 , m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor) 104 , m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor)
111 , m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor) 105 , m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor)
112 , userModify(o.userModify) 106 , userModify(o.userModify)
113 , wordBreak(o.wordBreak) 107 , wordBreak(o.wordBreak)
114 , overflowWrap(o.overflowWrap) 108 , overflowWrap(o.overflowWrap)
115 , lineBreak(o.lineBreak) 109 , lineBreak(o.lineBreak)
116 , userSelect(o.userSelect) 110 , userSelect(o.userSelect)
117 , speak(o.speak) 111 , speak(o.speak)
118 , hyphens(o.hyphens) 112 , hyphens(o.hyphens)
119 , textEmphasisFill(o.textEmphasisFill) 113 , textEmphasisFill(o.textEmphasisFill)
120 , textEmphasisMark(o.textEmphasisMark) 114 , textEmphasisMark(o.textEmphasisMark)
121 , textEmphasisPosition(o.textEmphasisPosition) 115 , textEmphasisPosition(o.textEmphasisPosition)
122 , m_textAlignLast(o.m_textAlignLast) 116 , m_textAlignLast(o.m_textAlignLast)
123 , m_textJustify(o.m_textJustify) 117 , m_textJustify(o.m_textJustify)
124 , m_textOrientation(o.m_textOrientation) 118 , m_textOrientation(o.m_textOrientation)
125 , m_textIndentLine(o.m_textIndentLine) 119 , m_textIndentLine(o.m_textIndentLine)
126 , m_textIndentType(o.m_textIndentType) 120 , m_textIndentType(o.m_textIndentType)
127 , m_lineBoxContain(o.m_lineBoxContain) 121 , m_lineBoxContain(o.m_lineBoxContain)
128 , m_imageRendering(o.m_imageRendering) 122 , m_imageRendering(o.m_imageRendering)
129 , m_textUnderlinePosition(o.m_textUnderlinePosition) 123 , m_textUnderlinePosition(o.m_textUnderlinePosition)
130 , m_touchActionDelay(o.m_touchActionDelay) 124 , m_touchActionDelay(o.m_touchActionDelay)
131 , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents) 125 , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents)
132 , hyphenationString(o.hyphenationString) 126 , m_hasAutoWidows(o.m_hasAutoWidows)
127 , widows(o.widows)
133 , hyphenationLimitBefore(o.hyphenationLimitBefore) 128 , hyphenationLimitBefore(o.hyphenationLimitBefore)
134 , hyphenationLimitAfter(o.hyphenationLimitAfter) 129 , hyphenationLimitAfter(o.hyphenationLimitAfter)
135 , hyphenationLimitLines(o.hyphenationLimitLines) 130 , hyphenationLimitLines(o.hyphenationLimitLines)
131 , hyphenationString(o.hyphenationString)
136 , locale(o.locale) 132 , locale(o.locale)
137 , textEmphasisCustomMark(o.textEmphasisCustomMark) 133 , textEmphasisCustomMark(o.textEmphasisCustomMark)
138 , m_tabSize(o.m_tabSize) 134 , m_tabSize(o.m_tabSize)
139 , tapHighlightColor(o.tapHighlightColor) 135 , tapHighlightColor(o.tapHighlightColor)
140 , appliedTextDecorations(o.appliedTextDecorations) 136 , appliedTextDecorations(o.appliedTextDecorations)
141 { 137 {
142 } 138 }
143 139
144 StyleRareInheritedData::~StyleRareInheritedData() 140 StyleRareInheritedData::~StyleRareInheritedData()
145 { 141 {
146 } 142 }
147 143
148 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const 144 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
149 { 145 {
150 return m_textStrokeColor == o.m_textStrokeColor 146 return m_textStrokeColor == o.m_textStrokeColor
151 && textStrokeWidth == o.textStrokeWidth 147 && textStrokeWidth == o.textStrokeWidth
152 && m_textFillColor == o.m_textFillColor 148 && m_textFillColor == o.m_textFillColor
153 && m_textEmphasisColor == o.m_textEmphasisColor 149 && m_textEmphasisColor == o.m_textEmphasisColor
154 && tapHighlightColor == o.tapHighlightColor 150 && tapHighlightColor == o.tapHighlightColor
155 && shadowDataEquivalent(o) 151 && shadowDataEquivalent(o)
156 && highlight == o.highlight 152 && highlight == o.highlight
157 && dataEquivalent(cursorData.get(), o.cursorData.get()) 153 && dataEquivalent(cursorData.get(), o.cursorData.get())
158 && indent == o.indent 154 && indent == o.indent
159 && widows == o.widows 155 && widows == o.widows
160 && orphans == o.orphans
161 && m_hasAutoWidows == o.m_hasAutoWidows 156 && m_hasAutoWidows == o.m_hasAutoWidows
162 && m_hasAutoOrphans == o.m_hasAutoOrphans
163 && m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor 157 && m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor
164 && m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor 158 && m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor
165 && m_textEmphasisColorIsCurrentColor == o.m_textEmphasisColorIsCurrentCo lor 159 && m_textEmphasisColorIsCurrentColor == o.m_textEmphasisColorIsCurrentCo lor
166 && userModify == o.userModify 160 && userModify == o.userModify
167 && wordBreak == o.wordBreak 161 && wordBreak == o.wordBreak
168 && overflowWrap == o.overflowWrap 162 && overflowWrap == o.overflowWrap
169 && lineBreak == o.lineBreak 163 && lineBreak == o.lineBreak
170 && userSelect == o.userSelect 164 && userSelect == o.userSelect
171 && speak == o.speak 165 && speak == o.speak
172 && hyphens == o.hyphens 166 && hyphens == o.hyphens
(...skipping 26 matching lines...) Expand all
199 { 193 {
200 return dataEquivalent(textShadow.get(), o.textShadow.get()); 194 return dataEquivalent(textShadow.get(), o.textShadow.get());
201 } 195 }
202 196
203 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 197 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
204 { 198 {
205 return dataEquivalent(quotes, o.quotes); 199 return dataEquivalent(quotes, o.quotes);
206 } 200 }
207 201
208 } // namespace blink 202 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698