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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2553703003: Made border-collapse property independent. (Closed)
Patch Set: Added TODO to remove compareEqualIndependent() when all independent properties are generated Created 4 years 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/css/CSSProperties.in ('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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 compareEqualNonIndependent(other); 202 compareEqualNonIndependent(other);
203 } 203 }
204 204
205 bool operator!=(const InheritedData& other) const { 205 bool operator!=(const InheritedData& other) const {
206 return !(*this == other); 206 return !(*this == other);
207 } 207 }
208 208
209 inline bool compareEqualIndependent(const InheritedData& other) const { 209 inline bool compareEqualIndependent(const InheritedData& other) const {
210 // These must match the properties tagged 'independent' in 210 // These must match the properties tagged 'independent' in
211 // CSSProperties.in. 211 // CSSProperties.in.
212 // TODO(sashab): Generate this function. 212 // TODO(napper): Remove this once all independent properties are
213 // generated and replace with a private function used only in
214 // stylePropagationDiff().
213 return (m_pointerEvents == other.m_pointerEvents) && 215 return (m_pointerEvents == other.m_pointerEvents) &&
214 (m_whiteSpace == other.m_whiteSpace); 216 (m_whiteSpace == other.m_whiteSpace);
215 } 217 }
216 218
217 inline bool compareEqualNonIndependent(const InheritedData& other) const { 219 inline bool compareEqualNonIndependent(const InheritedData& other) const {
218 return (m_listStyleType == other.m_listStyleType) && 220 return (m_listStyleType == other.m_listStyleType) &&
219 (m_textAlign == other.m_textAlign) && 221 (m_textAlign == other.m_textAlign) &&
220 (m_hasSimpleUnderline == other.m_hasSimpleUnderline) && 222 (m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
221 (m_cursorStyle == other.m_cursorStyle) && 223 (m_cursorStyle == other.m_cursorStyle) &&
222 (m_direction == other.m_direction) && 224 (m_direction == other.m_direction) &&
(...skipping 3859 matching lines...) Expand 10 before | Expand all | Expand 10 after
4082 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 4084 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
4083 } 4085 }
4084 4086
4085 inline bool ComputedStyle::hasPseudoElementStyle() const { 4087 inline bool ComputedStyle::hasPseudoElementStyle() const {
4086 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 4088 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
4087 } 4089 }
4088 4090
4089 } // namespace blink 4091 } // namespace blink
4090 4092
4091 #endif // ComputedStyle_h 4093 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698