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

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

Issue 1069403003: Remove CSS list-style (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 21 matching lines...) Expand all
32 32
33 namespace blink { 33 namespace blink {
34 34
35 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI nheritedData> { 35 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI nheritedData> {
36 void* styleImage; 36 void* styleImage;
37 Color firstColor; 37 Color firstColor;
38 float firstFloat; 38 float firstFloat;
39 Color colors[2]; 39 Color colors[2];
40 void* ownPtrs[1]; 40 void* ownPtrs[1];
41 AtomicString atomicStrings[4]; 41 AtomicString atomicStrings[4];
42 void* refPtrs[2]; 42 void* refPtrs[1];
43 Length lengths[1]; 43 Length lengths[1];
44 unsigned m_bitfields[2]; 44 unsigned m_bitfields[2];
45 short pagedMediaShorts[2]; 45 short pagedMediaShorts[2];
46 unsigned unsigneds[1]; 46 unsigned unsigneds[1];
47 short hyphenationShorts[3]; 47 short hyphenationShorts[3];
48 48
49 Color touchColors; 49 Color touchColors;
50 }; 50 };
51 51
52 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack); 52 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack);
53 53
54 StyleRareInheritedData::StyleRareInheritedData() 54 StyleRareInheritedData::StyleRareInheritedData()
55 : listStyleImage(RenderStyle::initialListStyleImage()) 55 : textStrokeWidth(RenderStyle::initialTextStrokeWidth())
56 , textStrokeWidth(RenderStyle::initialTextStrokeWidth())
57 , indent(RenderStyle::initialTextIndent()) 56 , indent(RenderStyle::initialTextIndent())
58 , widows(RenderStyle::initialWidows()) 57 , widows(RenderStyle::initialWidows())
59 , orphans(RenderStyle::initialOrphans()) 58 , orphans(RenderStyle::initialOrphans())
60 , m_hasAutoWidows(true) 59 , m_hasAutoWidows(true)
61 , m_hasAutoOrphans(true) 60 , m_hasAutoOrphans(true)
62 , m_textStrokeColorIsCurrentColor(true) 61 , m_textStrokeColorIsCurrentColor(true)
63 , m_textFillColorIsCurrentColor(true) 62 , m_textFillColorIsCurrentColor(true)
64 , m_textEmphasisColorIsCurrentColor(true) 63 , m_textEmphasisColorIsCurrentColor(true)
65 , userModify(READ_ONLY) 64 , userModify(READ_ONLY)
66 , wordBreak(RenderStyle::initialWordBreak()) 65 , wordBreak(RenderStyle::initialWordBreak())
(...skipping 18 matching lines...) Expand all
85 , hyphenationLimitBefore(-1) 84 , hyphenationLimitBefore(-1)
86 , hyphenationLimitAfter(-1) 85 , hyphenationLimitAfter(-1)
87 , hyphenationLimitLines(-1) 86 , hyphenationLimitLines(-1)
88 , m_tabSize(RenderStyle::initialTabSize()) 87 , m_tabSize(RenderStyle::initialTabSize())
89 , tapHighlightColor(RenderStyle::initialTapHighlightColor()) 88 , tapHighlightColor(RenderStyle::initialTapHighlightColor())
90 { 89 {
91 } 90 }
92 91
93 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) 92 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
94 : RefCounted<StyleRareInheritedData>() 93 : RefCounted<StyleRareInheritedData>()
95 , listStyleImage(o.listStyleImage)
96 , m_textStrokeColor(o.m_textStrokeColor) 94 , m_textStrokeColor(o.m_textStrokeColor)
97 , textStrokeWidth(o.textStrokeWidth) 95 , textStrokeWidth(o.textStrokeWidth)
98 , m_textFillColor(o.m_textFillColor) 96 , m_textFillColor(o.m_textFillColor)
99 , m_textEmphasisColor(o.m_textEmphasisColor) 97 , m_textEmphasisColor(o.m_textEmphasisColor)
100 , textShadow(o.textShadow) 98 , textShadow(o.textShadow)
101 , highlight(o.highlight) 99 , highlight(o.highlight)
102 , indent(o.indent) 100 , indent(o.indent)
103 , widows(o.widows) 101 , widows(o.widows)
104 , orphans(o.orphans) 102 , orphans(o.orphans)
105 , m_hasAutoWidows(o.m_hasAutoWidows) 103 , m_hasAutoWidows(o.m_hasAutoWidows)
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 && m_textIndentType == o.m_textIndentType 179 && m_textIndentType == o.m_textIndentType
182 && m_lineBoxContain == o.m_lineBoxContain 180 && m_lineBoxContain == o.m_lineBoxContain
183 && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents 181 && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents
184 && hyphenationString == o.hyphenationString 182 && hyphenationString == o.hyphenationString
185 && locale == o.locale 183 && locale == o.locale
186 && textEmphasisCustomMark == o.textEmphasisCustomMark 184 && textEmphasisCustomMark == o.textEmphasisCustomMark
187 && quotesDataEquivalent(o) 185 && quotesDataEquivalent(o)
188 && m_tabSize == o.m_tabSize 186 && m_tabSize == o.m_tabSize
189 && m_imageRendering == o.m_imageRendering 187 && m_imageRendering == o.m_imageRendering
190 && m_textUnderlinePosition == o.m_textUnderlinePosition 188 && m_textUnderlinePosition == o.m_textUnderlinePosition
191 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
192 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations); 189 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations);
193 } 190 }
194 191
195 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 192 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
196 { 193 {
197 return dataEquivalent(textShadow.get(), o.textShadow.get()); 194 return dataEquivalent(textShadow.get(), o.textShadow.get());
198 } 195 }
199 196
200 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 197 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
201 { 198 {
202 return dataEquivalent(quotes, o.quotes); 199 return dataEquivalent(quotes, o.quotes);
203 } 200 }
204 201
205 } // 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