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

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

Issue 1225553002: CSSValue Immediates: Make CSSPrimitiveValue a container (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cssvalue_patch_1
Patch Set: Rebase Created 5 years, 4 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/core/css/StylePropertySet.h ('k') | Source/core/css/parser/CSSParser.cpp » ('j') | 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, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
5 * Copyright (C) 2013 Intel Corporation. All rights reserved. 5 * Copyright (C) 2013 Intel Corporation. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 // Setting the value to an empty string just removes the property in both IE and Gecko. 243 // Setting the value to an empty string just removes the property in both IE and Gecko.
244 // Setting it to null seems to produce less consistent results, but we treat it just the same. 244 // Setting it to null seems to produce less consistent results, but we treat it just the same.
245 if (value.isEmpty()) 245 if (value.isEmpty())
246 return removeProperty(resolveCSSPropertyID(unresolvedProperty)); 246 return removeProperty(resolveCSSPropertyID(unresolvedProperty));
247 247
248 // When replacing an existing property value, this moves the property to the end of the list. 248 // When replacing an existing property value, this moves the property to the end of the list.
249 // Firefox preserves the position, and MSIE moves the property to the beginn ing. 249 // Firefox preserves the position, and MSIE moves the property to the beginn ing.
250 return CSSParser::parseValue(this, unresolvedProperty, value, important, css ParserMode(), contextStyleSheet); 250 return CSSParser::parseValue(this, unresolvedProperty, value, important, css ParserMode(), contextStyleSheet);
251 } 251 }
252 252
253 void MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSPrimitive Value prpValue, bool important)
254 {
255 setProperty(propertyID, CSSValue(prpValue), important);
256 }
257
253 void MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSValue prp Value, bool important) 258 void MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSValue prp Value, bool important)
254 { 259 {
255 StylePropertyShorthand shorthand = shorthandForProperty(propertyID); 260 StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
256 if (!shorthand.length()) { 261 if (!shorthand.length()) {
257 setProperty(CSSProperty(propertyID, prpValue, important)); 262 setProperty(CSSProperty(propertyID, prpValue, important));
258 return; 263 return;
259 } 264 }
260 265
261 removePropertiesInSet(shorthand.properties(), shorthand.length()); 266 removePropertiesInSet(shorthand.properties(), shorthand.length());
262 267
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 { 513 {
509 return adoptRefWillBeNoop(new MutableStylePropertySet(cssParserMode)); 514 return adoptRefWillBeNoop(new MutableStylePropertySet(cssParserMode));
510 } 515 }
511 516
512 PassRefPtrWillBeRawPtr<MutableStylePropertySet> MutableStylePropertySet::create( const CSSProperty* properties, unsigned count) 517 PassRefPtrWillBeRawPtr<MutableStylePropertySet> MutableStylePropertySet::create( const CSSProperty* properties, unsigned count)
513 { 518 {
514 return adoptRefWillBeNoop(new MutableStylePropertySet(properties, count)); 519 return adoptRefWillBeNoop(new MutableStylePropertySet(properties, count));
515 } 520 }
516 521
517 } // namespace blink 522 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/StylePropertySet.h ('k') | Source/core/css/parser/CSSParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698