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

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

Issue 1192983003: CSS Custom Properties (Variables) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use m_unit 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 | Annotate | Revision Log
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];
57 }; 58 };
58 59
59 static_assert(sizeof(StyleRareInheritedData) <= sizeof(SameSizeAsStyleRareInheri tedData), "StyleRareInheritedData should stay small"); 60 static_assert(sizeof(StyleRareInheritedData) <= sizeof(SameSizeAsStyleRareInheri tedData), "StyleRareInheritedData should stay small");
60 61
61 StyleRareInheritedData::StyleRareInheritedData() 62 StyleRareInheritedData::StyleRareInheritedData()
62 : listStyleImage(ComputedStyle::initialListStyleImage()) 63 : listStyleImage(ComputedStyle::initialListStyleImage())
63 , textStrokeWidth(ComputedStyle::initialTextStrokeWidth()) 64 , textStrokeWidth(ComputedStyle::initialTextStrokeWidth())
64 , indent(ComputedStyle::initialTextIndent()) 65 , indent(ComputedStyle::initialTextIndent())
65 , m_effectiveZoom(ComputedStyle::initialZoom()) 66 , m_effectiveZoom(ComputedStyle::initialZoom())
66 , widows(ComputedStyle::initialWidows()) 67 , widows(ComputedStyle::initialWidows())
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 , m_respectImageOrientation(o.m_respectImageOrientation) 153 , m_respectImageOrientation(o.m_respectImageOrientation)
153 , hyphenationString(o.hyphenationString) 154 , hyphenationString(o.hyphenationString)
154 , hyphenationLimitBefore(o.hyphenationLimitBefore) 155 , hyphenationLimitBefore(o.hyphenationLimitBefore)
155 , hyphenationLimitAfter(o.hyphenationLimitAfter) 156 , hyphenationLimitAfter(o.hyphenationLimitAfter)
156 , hyphenationLimitLines(o.hyphenationLimitLines) 157 , hyphenationLimitLines(o.hyphenationLimitLines)
157 , locale(o.locale) 158 , locale(o.locale)
158 , textEmphasisCustomMark(o.textEmphasisCustomMark) 159 , textEmphasisCustomMark(o.textEmphasisCustomMark)
159 , tapHighlightColor(o.tapHighlightColor) 160 , tapHighlightColor(o.tapHighlightColor)
160 , appliedTextDecorations(o.appliedTextDecorations) 161 , appliedTextDecorations(o.appliedTextDecorations)
161 , m_tabSize(o.m_tabSize) 162 , m_tabSize(o.m_tabSize)
163 , variables(o.variables)
162 { 164 {
163 } 165 }
164 166
165 StyleRareInheritedData::~StyleRareInheritedData() 167 StyleRareInheritedData::~StyleRareInheritedData()
166 { 168 {
167 } 169 }
168 170
169 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const 171 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
170 { 172 {
171 return m_textStrokeColor == o.m_textStrokeColor 173 return m_textStrokeColor == o.m_textStrokeColor
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 && m_respectImageOrientation == o.m_respectImageOrientation 217 && m_respectImageOrientation == o.m_respectImageOrientation
216 && hyphenationString == o.hyphenationString 218 && hyphenationString == o.hyphenationString
217 && locale == o.locale 219 && locale == o.locale
218 && textEmphasisCustomMark == o.textEmphasisCustomMark 220 && textEmphasisCustomMark == o.textEmphasisCustomMark
219 && quotesDataEquivalent(o) 221 && quotesDataEquivalent(o)
220 && m_tabSize == o.m_tabSize 222 && m_tabSize == o.m_tabSize
221 && m_imageRendering == o.m_imageRendering 223 && m_imageRendering == o.m_imageRendering
222 && m_textUnderlinePosition == o.m_textUnderlinePosition 224 && m_textUnderlinePosition == o.m_textUnderlinePosition
223 && m_rubyPosition == o.m_rubyPosition 225 && m_rubyPosition == o.m_rubyPosition
224 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) 226 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
225 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations); 227 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations)
228 && variables == o.variables;
226 } 229 }
227 230
228 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 231 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
229 { 232 {
230 return dataEquivalent(textShadow.get(), o.textShadow.get()); 233 return dataEquivalent(textShadow.get(), o.textShadow.get());
231 } 234 }
232 235
233 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 236 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
234 { 237 {
235 return dataEquivalent(quotes, o.quotes); 238 return dataEquivalent(quotes, o.quotes);
236 } 239 }
237 240
238 } // namespace blink 241 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698