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

Side by Side Diff: Source/core/rendering/style/StyleRareInheritedData.cpp

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase. Created 7 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 | 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 30 matching lines...) Expand all
41 void* ownPtrs[1]; 41 void* ownPtrs[1];
42 AtomicString atomicStrings[5]; 42 AtomicString atomicStrings[5];
43 void* refPtrs[2]; 43 void* refPtrs[2];
44 Length lengths[1]; 44 Length lengths[1];
45 float secondFloat; 45 float secondFloat;
46 unsigned m_bitfields[2]; 46 unsigned m_bitfields[2];
47 short pagedMediaShorts[2]; 47 short pagedMediaShorts[2];
48 unsigned unsigneds[1]; 48 unsigned unsigneds[1];
49 short hyphenationShorts[3]; 49 short hyphenationShorts[3];
50 50
51 #if ENABLE(TOUCH_EVENTS)
52 Color touchColors; 51 Color touchColors;
53 #endif
54 52
55 void* variableDataRefs[1]; 53 void* variableDataRefs[1];
56 }; 54 };
57 55
58 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack); 56 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack);
59 57
60 StyleRareInheritedData::StyleRareInheritedData() 58 StyleRareInheritedData::StyleRareInheritedData()
61 : listStyleImage(RenderStyle::initialListStyleImage()) 59 : listStyleImage(RenderStyle::initialListStyleImage())
62 , textStrokeWidth(RenderStyle::initialTextStrokeWidth()) 60 , textStrokeWidth(RenderStyle::initialTextStrokeWidth())
63 , indent(RenderStyle::initialTextIndent()) 61 , indent(RenderStyle::initialTextIndent())
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 #if ENABLE(CSS3_TEXT) 94 #if ENABLE(CSS3_TEXT)
97 , m_textAlignLast(RenderStyle::initialTextAlignLast()) 95 , m_textAlignLast(RenderStyle::initialTextAlignLast())
98 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) 96 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
99 #endif // CSS3_TEXT 97 #endif // CSS3_TEXT
100 , m_rubyPosition(RenderStyle::initialRubyPosition()) 98 , m_rubyPosition(RenderStyle::initialRubyPosition())
101 , hyphenationLimitBefore(-1) 99 , hyphenationLimitBefore(-1)
102 , hyphenationLimitAfter(-1) 100 , hyphenationLimitAfter(-1)
103 , hyphenationLimitLines(-1) 101 , hyphenationLimitLines(-1)
104 , m_lineGrid(RenderStyle::initialLineGrid()) 102 , m_lineGrid(RenderStyle::initialLineGrid())
105 , m_tabSize(RenderStyle::initialTabSize()) 103 , m_tabSize(RenderStyle::initialTabSize())
106 #if ENABLE(TOUCH_EVENTS)
107 , tapHighlightColor(RenderStyle::initialTapHighlightColor()) 104 , tapHighlightColor(RenderStyle::initialTapHighlightColor())
108 #endif
109 { 105 {
110 m_variables.init(); 106 m_variables.init();
111 } 107 }
112 108
113 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) 109 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
114 : RefCounted<StyleRareInheritedData>() 110 : RefCounted<StyleRareInheritedData>()
115 , listStyleImage(o.listStyleImage) 111 , listStyleImage(o.listStyleImage)
116 , textStrokeColor(o.textStrokeColor) 112 , textStrokeColor(o.textStrokeColor)
117 , textStrokeWidth(o.textStrokeWidth) 113 , textStrokeWidth(o.textStrokeWidth)
118 , textFillColor(o.textFillColor) 114 , textFillColor(o.textFillColor)
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 #endif // CSS3_TEXT 158 #endif // CSS3_TEXT
163 , m_rubyPosition(o.m_rubyPosition) 159 , m_rubyPosition(o.m_rubyPosition)
164 , hyphenationString(o.hyphenationString) 160 , hyphenationString(o.hyphenationString)
165 , hyphenationLimitBefore(o.hyphenationLimitBefore) 161 , hyphenationLimitBefore(o.hyphenationLimitBefore)
166 , hyphenationLimitAfter(o.hyphenationLimitAfter) 162 , hyphenationLimitAfter(o.hyphenationLimitAfter)
167 , hyphenationLimitLines(o.hyphenationLimitLines) 163 , hyphenationLimitLines(o.hyphenationLimitLines)
168 , locale(o.locale) 164 , locale(o.locale)
169 , textEmphasisCustomMark(o.textEmphasisCustomMark) 165 , textEmphasisCustomMark(o.textEmphasisCustomMark)
170 , m_lineGrid(o.m_lineGrid) 166 , m_lineGrid(o.m_lineGrid)
171 , m_tabSize(o.m_tabSize) 167 , m_tabSize(o.m_tabSize)
172 #if ENABLE(TOUCH_EVENTS)
173 , tapHighlightColor(o.tapHighlightColor) 168 , tapHighlightColor(o.tapHighlightColor)
174 #endif
175 , m_variables(o.m_variables) 169 , m_variables(o.m_variables)
176 { 170 {
177 } 171 }
178 172
179 StyleRareInheritedData::~StyleRareInheritedData() 173 StyleRareInheritedData::~StyleRareInheritedData()
180 { 174 {
181 } 175 }
182 176
183 static bool cursorDataEquivalent(const CursorList* c1, const CursorList* c2) 177 static bool cursorDataEquivalent(const CursorList* c1, const CursorList* c2)
184 { 178 {
185 if (c1 == c2) 179 if (c1 == c2)
186 return true; 180 return true;
187 if ((!c1 && c2) || (c1 && !c2)) 181 if ((!c1 && c2) || (c1 && !c2))
188 return false; 182 return false;
189 return (*c1 == *c2); 183 return (*c1 == *c2);
190 } 184 }
191 185
192 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const 186 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
193 { 187 {
194 return textStrokeColor == o.textStrokeColor 188 return textStrokeColor == o.textStrokeColor
195 && textStrokeWidth == o.textStrokeWidth 189 && textStrokeWidth == o.textStrokeWidth
196 && textFillColor == o.textFillColor 190 && textFillColor == o.textFillColor
197 && textEmphasisColor == o.textEmphasisColor 191 && textEmphasisColor == o.textEmphasisColor
198 && visitedLinkTextStrokeColor == o.visitedLinkTextStrokeColor 192 && visitedLinkTextStrokeColor == o.visitedLinkTextStrokeColor
199 && visitedLinkTextFillColor == o.visitedLinkTextFillColor 193 && visitedLinkTextFillColor == o.visitedLinkTextFillColor
200 && visitedLinkTextEmphasisColor == o.visitedLinkTextEmphasisColor 194 && visitedLinkTextEmphasisColor == o.visitedLinkTextEmphasisColor
201 #if ENABLE(TOUCH_EVENTS)
202 && tapHighlightColor == o.tapHighlightColor 195 && tapHighlightColor == o.tapHighlightColor
203 #endif
204 && shadowDataEquivalent(o) 196 && shadowDataEquivalent(o)
205 && highlight == o.highlight 197 && highlight == o.highlight
206 && cursorDataEquivalent(cursorData.get(), o.cursorData.get()) 198 && cursorDataEquivalent(cursorData.get(), o.cursorData.get())
207 && indent == o.indent 199 && indent == o.indent
208 && m_effectiveZoom == o.m_effectiveZoom 200 && m_effectiveZoom == o.m_effectiveZoom
209 && widows == o.widows 201 && widows == o.widows
210 && orphans == o.orphans 202 && orphans == o.orphans
211 && m_hasAutoWidows == o.m_hasAutoWidows 203 && m_hasAutoWidows == o.m_hasAutoWidows
212 && m_hasAutoOrphans == o.m_hasAutoOrphans 204 && m_hasAutoOrphans == o.m_hasAutoOrphans
213 && textSecurity == o.textSecurity 205 && textSecurity == o.textSecurity
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 info.addMember(cursorData, "cursorData"); 266 info.addMember(cursorData, "cursorData");
275 info.addMember(hyphenationString, "hyphenationString"); 267 info.addMember(hyphenationString, "hyphenationString");
276 info.addMember(locale, "locale"); 268 info.addMember(locale, "locale");
277 info.addMember(textEmphasisCustomMark, "textEmphasisCustomMark"); 269 info.addMember(textEmphasisCustomMark, "textEmphasisCustomMark");
278 info.addMember(quotes, "quotes"); 270 info.addMember(quotes, "quotes");
279 info.addMember(m_lineGrid, "lineGrid"); 271 info.addMember(m_lineGrid, "lineGrid");
280 info.addMember(m_variables, "variables"); 272 info.addMember(m_variables, "variables");
281 } 273 }
282 274
283 } // namespace WebCore 275 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | Source/core/testing/InternalSettings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698