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

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

Issue 1696373003: Add CSS parser support for the snap-height property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 10 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 | « third_party/WebKit/Source/core/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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 void* refPtrs[1]; 44 void* refPtrs[1];
45 Persistent<void*> persistentHandles[2]; 45 Persistent<void*> persistentHandles[2];
46 #else 46 #else
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 uint8_t snapHeight;
54 55
55 Color touchColors; 56 Color touchColors;
56 TabSize tabSize; 57 TabSize tabSize;
57 void* variables[1]; 58 void* variables[1];
58 }; 59 };
59 60
60 static_assert(sizeof(StyleRareInheritedData) <= sizeof(SameSizeAsStyleRareInheri tedData), "StyleRareInheritedData should stay small"); 61 static_assert(sizeof(StyleRareInheritedData) <= sizeof(SameSizeAsStyleRareInheri tedData), "StyleRareInheritedData should stay small");
61 62
62 StyleRareInheritedData::StyleRareInheritedData() 63 StyleRareInheritedData::StyleRareInheritedData()
63 : listStyleImage(ComputedStyle::initialListStyleImage()) 64 : listStyleImage(ComputedStyle::initialListStyleImage())
(...skipping 25 matching lines...) Expand all
89 , m_textOrientation(TextOrientationMixed) 90 , m_textOrientation(TextOrientationMixed)
90 , m_textCombine(ComputedStyle::initialTextCombine()) 91 , m_textCombine(ComputedStyle::initialTextCombine())
91 , m_textIndentLine(ComputedStyle::initialTextIndentLine()) 92 , m_textIndentLine(ComputedStyle::initialTextIndentLine())
92 , m_textIndentType(ComputedStyle::initialTextIndentLine()) 93 , m_textIndentType(ComputedStyle::initialTextIndentLine())
93 , m_imageRendering(ComputedStyle::initialImageRendering()) 94 , m_imageRendering(ComputedStyle::initialImageRendering())
94 , m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition()) 95 , m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition())
95 , m_rubyPosition(ComputedStyle::initialRubyPosition()) 96 , m_rubyPosition(ComputedStyle::initialRubyPosition())
96 , m_subtreeWillChangeContents(false) 97 , m_subtreeWillChangeContents(false)
97 , m_selfOrAncestorHasDirAutoAttribute(false) 98 , m_selfOrAncestorHasDirAutoAttribute(false)
98 , m_respectImageOrientation(false) 99 , m_respectImageOrientation(false)
100 , m_snapHeightPosition(0)
99 , hyphenationLimitBefore(-1) 101 , hyphenationLimitBefore(-1)
100 , hyphenationLimitAfter(-1) 102 , hyphenationLimitAfter(-1)
101 , hyphenationLimitLines(-1) 103 , hyphenationLimitLines(-1)
104 , m_snapHeightUnit(0)
102 , tapHighlightColor(ComputedStyle::initialTapHighlightColor()) 105 , tapHighlightColor(ComputedStyle::initialTapHighlightColor())
103 , m_tabSize(ComputedStyle::initialTabSize()) 106 , m_tabSize(ComputedStyle::initialTabSize())
104 { 107 {
105 } 108 }
106 109
107 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) 110 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
108 : RefCounted<StyleRareInheritedData>() 111 : RefCounted<StyleRareInheritedData>()
109 , listStyleImage(o.listStyleImage) 112 , listStyleImage(o.listStyleImage)
110 , m_textStrokeColor(o.m_textStrokeColor) 113 , m_textStrokeColor(o.m_textStrokeColor)
111 , textStrokeWidth(o.textStrokeWidth) 114 , textStrokeWidth(o.textStrokeWidth)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 , m_textOrientation(o.m_textOrientation) 147 , m_textOrientation(o.m_textOrientation)
145 , m_textCombine(o.m_textCombine) 148 , m_textCombine(o.m_textCombine)
146 , m_textIndentLine(o.m_textIndentLine) 149 , m_textIndentLine(o.m_textIndentLine)
147 , m_textIndentType(o.m_textIndentType) 150 , m_textIndentType(o.m_textIndentType)
148 , m_imageRendering(o.m_imageRendering) 151 , m_imageRendering(o.m_imageRendering)
149 , m_textUnderlinePosition(o.m_textUnderlinePosition) 152 , m_textUnderlinePosition(o.m_textUnderlinePosition)
150 , m_rubyPosition(o.m_rubyPosition) 153 , m_rubyPosition(o.m_rubyPosition)
151 , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents) 154 , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents)
152 , m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute) 155 , m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute)
153 , m_respectImageOrientation(o.m_respectImageOrientation) 156 , m_respectImageOrientation(o.m_respectImageOrientation)
157 , m_snapHeightPosition(o.m_snapHeightPosition)
154 , hyphenationString(o.hyphenationString) 158 , hyphenationString(o.hyphenationString)
155 , hyphenationLimitBefore(o.hyphenationLimitBefore) 159 , hyphenationLimitBefore(o.hyphenationLimitBefore)
156 , hyphenationLimitAfter(o.hyphenationLimitAfter) 160 , hyphenationLimitAfter(o.hyphenationLimitAfter)
157 , hyphenationLimitLines(o.hyphenationLimitLines) 161 , hyphenationLimitLines(o.hyphenationLimitLines)
162 , m_snapHeightUnit(o.m_snapHeightUnit)
158 , textEmphasisCustomMark(o.textEmphasisCustomMark) 163 , textEmphasisCustomMark(o.textEmphasisCustomMark)
159 , tapHighlightColor(o.tapHighlightColor) 164 , tapHighlightColor(o.tapHighlightColor)
160 , appliedTextDecorations(o.appliedTextDecorations) 165 , appliedTextDecorations(o.appliedTextDecorations)
161 , m_tabSize(o.m_tabSize) 166 , m_tabSize(o.m_tabSize)
162 , variables(o.variables) 167 , variables(o.variables)
163 { 168 {
164 } 169 }
165 170
166 StyleRareInheritedData::~StyleRareInheritedData() 171 StyleRareInheritedData::~StyleRareInheritedData()
167 { 172 {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 && textEmphasisPosition == o.textEmphasisPosition 212 && textEmphasisPosition == o.textEmphasisPosition
208 && m_textAlignLast == o.m_textAlignLast 213 && m_textAlignLast == o.m_textAlignLast
209 && m_textJustify == o.m_textJustify 214 && m_textJustify == o.m_textJustify
210 && m_textOrientation == o.m_textOrientation 215 && m_textOrientation == o.m_textOrientation
211 && m_textCombine == o.m_textCombine 216 && m_textCombine == o.m_textCombine
212 && m_textIndentLine == o.m_textIndentLine 217 && m_textIndentLine == o.m_textIndentLine
213 && m_textIndentType == o.m_textIndentType 218 && m_textIndentType == o.m_textIndentType
214 && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents 219 && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents
215 && m_selfOrAncestorHasDirAutoAttribute == o.m_selfOrAncestorHasDirAutoAt tribute 220 && m_selfOrAncestorHasDirAutoAttribute == o.m_selfOrAncestorHasDirAutoAt tribute
216 && m_respectImageOrientation == o.m_respectImageOrientation 221 && m_respectImageOrientation == o.m_respectImageOrientation
222 && m_snapHeightPosition == o.m_snapHeightPosition
217 && hyphenationString == o.hyphenationString 223 && hyphenationString == o.hyphenationString
224 && m_snapHeightUnit == o.m_snapHeightUnit
218 && textEmphasisCustomMark == o.textEmphasisCustomMark 225 && textEmphasisCustomMark == o.textEmphasisCustomMark
219 && quotesDataEquivalent(o) 226 && quotesDataEquivalent(o)
220 && m_tabSize == o.m_tabSize 227 && m_tabSize == o.m_tabSize
221 && m_imageRendering == o.m_imageRendering 228 && m_imageRendering == o.m_imageRendering
222 && m_textUnderlinePosition == o.m_textUnderlinePosition 229 && m_textUnderlinePosition == o.m_textUnderlinePosition
223 && m_rubyPosition == o.m_rubyPosition 230 && m_rubyPosition == o.m_rubyPosition
224 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) 231 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
225 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) 232 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations)
226 && dataEquivalent(variables, o.variables); 233 && dataEquivalent(variables, o.variables);
227 } 234 }
228 235
229 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 236 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
230 { 237 {
231 return dataEquivalent(textShadow.get(), o.textShadow.get()); 238 return dataEquivalent(textShadow.get(), o.textShadow.get());
232 } 239 }
233 240
234 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 241 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
235 { 242 {
236 return dataEquivalent(quotes, o.quotes); 243 return dataEquivalent(quotes, o.quotes);
237 } 244 }
238 245
239 } // namespace blink 246 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698