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

Side by Side Diff: Source/core/css/CSSPrimitiveValue.cpp

Issue 1105523005: Revert of Revert of Fix serialization of alias_for properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@p7
Patch Set: Created 5 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
« no previous file with comments | « Source/build/scripts/make_css_property_names.py ('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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv ed.
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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 case CalcTime: 252 case CalcTime:
253 return CSS_MS; 253 return CSS_MS;
254 case CalcOther: 254 case CalcOther:
255 return CSS_UNKNOWN; 255 return CSS_UNKNOWN;
256 } 256 }
257 return CSS_UNKNOWN; 257 return CSS_UNKNOWN;
258 } 258 }
259 259
260 static const AtomicString& propertyName(CSSPropertyID propertyID) 260 static const AtomicString& propertyName(CSSPropertyID propertyID)
261 { 261 {
262 ASSERT_ARG(propertyID, propertyID >= 0);
263 ASSERT_ARG(propertyID, (propertyID >= firstCSSProperty && propertyID < first CSSProperty + numCSSProperties));
264
265 if (propertyID < 0)
266 return nullAtom;
267
268 return getPropertyNameAtomicString(propertyID); 262 return getPropertyNameAtomicString(propertyID);
269 } 263 }
270 264
271 static const AtomicString& valueName(CSSValueID valueID) 265 static const AtomicString& valueName(CSSValueID valueID)
272 { 266 {
273 ASSERT_ARG(valueID, valueID >= 0); 267 ASSERT_ARG(valueID, valueID >= 0);
274 ASSERT_ARG(valueID, valueID < numCSSValueKeywords); 268 ASSERT_ARG(valueID, valueID < numCSSValueKeywords);
275 269
276 if (valueID < 0) 270 if (valueID < 0)
277 return nullAtom; 271 return nullAtom;
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
1224 visitor->trace(m_value.shape); 1218 visitor->trace(m_value.shape);
1225 break; 1219 break;
1226 default: 1220 default:
1227 break; 1221 break;
1228 } 1222 }
1229 #endif 1223 #endif
1230 CSSValue::traceAfterDispatch(visitor); 1224 CSSValue::traceAfterDispatch(visitor);
1231 } 1225 }
1232 1226
1233 } // namespace blink 1227 } // namespace blink
OLDNEW
« no previous file with comments | « Source/build/scripts/make_css_property_names.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698