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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp

Issue 1406993009: Revert "CSS Custom Properties (Variables)" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 void* refPtrs[3]; 47 void* refPtrs[3];
48 #endif 48 #endif
49 Length lengths[1]; 49 Length lengths[1];
50 float secondFloat; 50 float secondFloat;
51 unsigned m_bitfields[2]; 51 unsigned m_bitfields[2];
52 short pagedMediaShorts[2]; 52 short pagedMediaShorts[2];
53 short hyphenationShorts[3]; 53 short hyphenationShorts[3];
54 54
55 Color touchColors; 55 Color touchColors;
56 TabSize tabSize; 56 TabSize tabSize;
57 void* variables[1];
58 }; 57 };
59 58
60 static_assert(sizeof(StyleRareInheritedData) <= sizeof(SameSizeAsStyleRareInheri tedData), "StyleRareInheritedData should stay small"); 59 static_assert(sizeof(StyleRareInheritedData) <= sizeof(SameSizeAsStyleRareInheri tedData), "StyleRareInheritedData should stay small");
61 60
62 StyleRareInheritedData::StyleRareInheritedData() 61 StyleRareInheritedData::StyleRareInheritedData()
63 : listStyleImage(ComputedStyle::initialListStyleImage()) 62 : listStyleImage(ComputedStyle::initialListStyleImage())
64 , textStrokeWidth(ComputedStyle::initialTextStrokeWidth()) 63 , textStrokeWidth(ComputedStyle::initialTextStrokeWidth())
65 , indent(ComputedStyle::initialTextIndent()) 64 , indent(ComputedStyle::initialTextIndent())
66 , m_effectiveZoom(ComputedStyle::initialZoom()) 65 , m_effectiveZoom(ComputedStyle::initialZoom())
67 , widows(ComputedStyle::initialWidows()) 66 , widows(ComputedStyle::initialWidows())
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 , m_respectImageOrientation(o.m_respectImageOrientation) 152 , m_respectImageOrientation(o.m_respectImageOrientation)
154 , hyphenationString(o.hyphenationString) 153 , hyphenationString(o.hyphenationString)
155 , hyphenationLimitBefore(o.hyphenationLimitBefore) 154 , hyphenationLimitBefore(o.hyphenationLimitBefore)
156 , hyphenationLimitAfter(o.hyphenationLimitAfter) 155 , hyphenationLimitAfter(o.hyphenationLimitAfter)
157 , hyphenationLimitLines(o.hyphenationLimitLines) 156 , hyphenationLimitLines(o.hyphenationLimitLines)
158 , locale(o.locale) 157 , locale(o.locale)
159 , textEmphasisCustomMark(o.textEmphasisCustomMark) 158 , textEmphasisCustomMark(o.textEmphasisCustomMark)
160 , tapHighlightColor(o.tapHighlightColor) 159 , tapHighlightColor(o.tapHighlightColor)
161 , appliedTextDecorations(o.appliedTextDecorations) 160 , appliedTextDecorations(o.appliedTextDecorations)
162 , m_tabSize(o.m_tabSize) 161 , m_tabSize(o.m_tabSize)
163 , variables(o.variables)
164 { 162 {
165 } 163 }
166 164
167 StyleRareInheritedData::~StyleRareInheritedData() 165 StyleRareInheritedData::~StyleRareInheritedData()
168 { 166 {
169 } 167 }
170 168
171 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const 169 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
172 { 170 {
173 return m_textStrokeColor == o.m_textStrokeColor 171 return m_textStrokeColor == o.m_textStrokeColor
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 && m_respectImageOrientation == o.m_respectImageOrientation 215 && m_respectImageOrientation == o.m_respectImageOrientation
218 && hyphenationString == o.hyphenationString 216 && hyphenationString == o.hyphenationString
219 && locale == o.locale 217 && locale == o.locale
220 && textEmphasisCustomMark == o.textEmphasisCustomMark 218 && textEmphasisCustomMark == o.textEmphasisCustomMark
221 && quotesDataEquivalent(o) 219 && quotesDataEquivalent(o)
222 && m_tabSize == o.m_tabSize 220 && m_tabSize == o.m_tabSize
223 && m_imageRendering == o.m_imageRendering 221 && m_imageRendering == o.m_imageRendering
224 && m_textUnderlinePosition == o.m_textUnderlinePosition 222 && m_textUnderlinePosition == o.m_textUnderlinePosition
225 && m_rubyPosition == o.m_rubyPosition 223 && m_rubyPosition == o.m_rubyPosition
226 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) 224 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
227 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) 225 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations);
228 && variables == o.variables;
229 } 226 }
230 227
231 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 228 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
232 { 229 {
233 return dataEquivalent(textShadow.get(), o.textShadow.get()); 230 return dataEquivalent(textShadow.get(), o.textShadow.get());
234 } 231 }
235 232
236 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 233 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
237 { 234 {
238 return dataEquivalent(quotes, o.quotes); 235 return dataEquivalent(quotes, o.quotes);
239 } 236 }
240 237
241 } // namespace blink 238 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698