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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSProperty.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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 } 221 }
222 222
223 bool CSSProperty::isAffectedByAllProperty(CSSPropertyID propertyID) 223 bool CSSProperty::isAffectedByAllProperty(CSSPropertyID propertyID)
224 { 224 {
225 if (propertyID == CSSPropertyAll) 225 if (propertyID == CSSPropertyAll)
226 return false; 226 return false;
227 227
228 if (!CSSPropertyMetadata::isEnabledProperty(propertyID)) 228 if (!CSSPropertyMetadata::isEnabledProperty(propertyID))
229 return false; 229 return false;
230 230
231 if (propertyID == CSSPropertyVariable)
232 return false;
233
231 // all shorthand spec says: 234 // all shorthand spec says:
232 // The all property is a shorthand that resets all CSS properties except 235 // The all property is a shorthand that resets all CSS properties except
233 // direction and unicode-bidi. It only accepts the CSS-wide keywords. 236 // direction and unicode-bidi. It only accepts the CSS-wide keywords.
234 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand 237 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand
235 // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not 238 // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not
236 // affected by all property. 239 // affected by all property.
237 return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDire ction; 240 return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDire ction;
238 } 241 }
239 242
240 bool CSSProperty::operator==(const CSSProperty& other) const 243 bool CSSProperty::operator==(const CSSProperty& other) const
241 { 244 {
242 return m_value->equals(*other.m_value) && isImportant() == other.isImportant (); 245 return m_value->equals(*other.m_value) && isImportant() == other.isImportant ();
243 } 246 }
244 247
245 } // namespace blink 248 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSCustomPropertyDeclaration.cpp ('k') | third_party/WebKit/Source/core/css/CSSValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698