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

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

Issue 1070263002: remove CSS quotes property (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,
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 "sky/engine/config.h" 22 #include "sky/engine/config.h"
23 #include "sky/engine/core/rendering/style/StyleRareInheritedData.h" 23 #include "sky/engine/core/rendering/style/StyleRareInheritedData.h"
24 24
25 #include "sky/engine/core/rendering/style/AppliedTextDecoration.h" 25 #include "sky/engine/core/rendering/style/AppliedTextDecoration.h"
26 #include "sky/engine/core/rendering/style/DataEquivalency.h" 26 #include "sky/engine/core/rendering/style/DataEquivalency.h"
27 #include "sky/engine/core/rendering/style/QuotesData.h"
28 #include "sky/engine/core/rendering/style/RenderStyle.h" 27 #include "sky/engine/core/rendering/style/RenderStyle.h"
29 #include "sky/engine/core/rendering/style/RenderStyleConstants.h" 28 #include "sky/engine/core/rendering/style/RenderStyleConstants.h"
30 #include "sky/engine/core/rendering/style/ShadowList.h" 29 #include "sky/engine/core/rendering/style/ShadowList.h"
31 #include "sky/engine/core/rendering/style/StyleImage.h" 30 #include "sky/engine/core/rendering/style/StyleImage.h"
32 31
33 namespace blink { 32 namespace blink {
34 33
35 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI nheritedData> { 34 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI nheritedData> {
36 void* styleImage; 35 void* styleImage;
37 Color firstColor; 36 Color firstColor;
38 float firstFloat; 37 float firstFloat;
39 Color colors[2]; 38 Color colors[2];
40 void* ownPtrs[1]; 39 void* ownPtrs[1];
41 AtomicString atomicStrings[4]; 40 AtomicString atomicStrings[4];
42 void* refPtrs[1];
43 Length lengths[1]; 41 Length lengths[1];
44 unsigned m_bitfields[2]; 42 unsigned m_bitfields[2];
45 unsigned unsigneds[1]; 43 unsigned unsigneds[1];
46 short pagedMediaShorts[1]; 44 short pagedMediaShorts[1];
47 short hyphenationShorts[3]; 45 short hyphenationShorts[3];
48 46
49 Color touchColors; 47 Color touchColors;
50 }; 48 };
51 49
52 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack); 50 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack);
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 && m_textAlignLast == o.m_textAlignLast 164 && m_textAlignLast == o.m_textAlignLast
167 && m_textJustify == o.m_textJustify 165 && m_textJustify == o.m_textJustify
168 && m_textOrientation == o.m_textOrientation 166 && m_textOrientation == o.m_textOrientation
169 && m_textIndentLine == o.m_textIndentLine 167 && m_textIndentLine == o.m_textIndentLine
170 && m_textIndentType == o.m_textIndentType 168 && m_textIndentType == o.m_textIndentType
171 && m_lineBoxContain == o.m_lineBoxContain 169 && m_lineBoxContain == o.m_lineBoxContain
172 && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents 170 && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents
173 && hyphenationString == o.hyphenationString 171 && hyphenationString == o.hyphenationString
174 && locale == o.locale 172 && locale == o.locale
175 && textEmphasisCustomMark == o.textEmphasisCustomMark 173 && textEmphasisCustomMark == o.textEmphasisCustomMark
176 && quotesDataEquivalent(o)
177 && m_tabSize == o.m_tabSize 174 && m_tabSize == o.m_tabSize
178 && m_imageRendering == o.m_imageRendering 175 && m_imageRendering == o.m_imageRendering
179 && m_textUnderlinePosition == o.m_textUnderlinePosition 176 && m_textUnderlinePosition == o.m_textUnderlinePosition
180 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations); 177 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations);
181 } 178 }
182 179
183 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 180 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
184 { 181 {
185 return dataEquivalent(textShadow.get(), o.textShadow.get()); 182 return dataEquivalent(textShadow.get(), o.textShadow.get());
186 } 183 }
187 184
188 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
189 {
190 return dataEquivalent(quotes, o.quotes);
191 }
192
193 } // namespace blink 185 } // 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