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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSProperty.cpp

Issue 1386733003: Do not accept CSS-wide keywords for descriptors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing Created 4 years, 6 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
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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 { 223 {
224 if (propertyID == CSSPropertyAll) 224 if (propertyID == CSSPropertyAll)
225 return false; 225 return false;
226 226
227 if (!CSSPropertyMetadata::isEnabledProperty(propertyID)) 227 if (!CSSPropertyMetadata::isEnabledProperty(propertyID))
228 return false; 228 return false;
229 229
230 if (propertyID == CSSPropertyVariable) 230 if (propertyID == CSSPropertyVariable)
231 return false; 231 return false;
232 232
233 if (CSSPropertyMetadata::isDescriptorOnly(propertyID))
234 return false;
235
233 // all shorthand spec says: 236 // all shorthand spec says:
234 // The all property is a shorthand that resets all CSS properties except 237 // The all property is a shorthand that resets all CSS properties except
235 // direction and unicode-bidi. It only accepts the CSS-wide keywords. 238 // direction and unicode-bidi. It only accepts the CSS-wide keywords.
236 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand 239 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand
237 // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not 240 // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not
238 // affected by all property. 241 // affected by all property.
239 return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDire ction; 242 return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDire ction;
240 } 243 }
241 244
242 bool CSSProperty::operator==(const CSSProperty& other) const 245 bool CSSProperty::operator==(const CSSProperty& other) const
243 { 246 {
244 return m_value->equals(*other.m_value) && isImportant() == other.isImportant (); 247 return m_value->equals(*other.m_value) && isImportant() == other.isImportant ();
245 } 248 }
246 249
247 } // namespace blink 250 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.in ('k') | third_party/WebKit/Source/core/css/CSSPropertyMetadata.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698