| OLD | NEW |
| 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 } | 249 } |
| 250 | 250 |
| 251 bool CSSProperty::isAffectedByAllProperty(CSSPropertyID propertyID) | 251 bool CSSProperty::isAffectedByAllProperty(CSSPropertyID propertyID) |
| 252 { | 252 { |
| 253 if (propertyID == CSSPropertyAll) | 253 if (propertyID == CSSPropertyAll) |
| 254 return false; | 254 return false; |
| 255 | 255 |
| 256 if (!CSSPropertyMetadata::isEnabledProperty(propertyID)) | 256 if (!CSSPropertyMetadata::isEnabledProperty(propertyID)) |
| 257 return false; | 257 return false; |
| 258 | 258 |
| 259 if (propertyID == CSSPropertyVariable) |
| 260 return false; |
| 261 |
| 259 // all shorthand spec says: | 262 // all shorthand spec says: |
| 260 // The all property is a shorthand that resets all CSS properties except | 263 // The all property is a shorthand that resets all CSS properties except |
| 261 // direction and unicode-bidi. It only accepts the CSS-wide keywords. | 264 // direction and unicode-bidi. It only accepts the CSS-wide keywords. |
| 262 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand | 265 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand |
| 263 // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not | 266 // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not |
| 264 // affected by all property. | 267 // affected by all property. |
| 265 return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDire
ction; | 268 return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDire
ction; |
| 266 } | 269 } |
| 267 | 270 |
| 268 bool CSSProperty::operator==(const CSSProperty& other) const | 271 bool CSSProperty::operator==(const CSSProperty& other) const |
| 269 { | 272 { |
| 270 return m_value->equals(*other.m_value) && isImportant() == other.isImportant
(); | 273 return m_value->equals(*other.m_value) && isImportant() == other.isImportant
(); |
| 271 } | 274 } |
| 272 | 275 |
| 273 } // namespace blink | 276 } // namespace blink |
| OLD | NEW |