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

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

Issue 16339006: Make sure to use CSSValueID and CSSPropertyID rather than integers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/StylePropertySet.h ('k') | Source/core/dom/StyledElement.h » ('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 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 } 268 }
269 269
270 void MutableStylePropertySet::setPrefixingVariantProperty(const CSSProperty& pro perty) 270 void MutableStylePropertySet::setPrefixingVariantProperty(const CSSProperty& pro perty)
271 { 271 {
272 CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(property.id() ); 272 CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(property.id() );
273 CSSProperty* toReplace = findCSSPropertyWithID(prefixingVariant); 273 CSSProperty* toReplace = findCSSPropertyWithID(prefixingVariant);
274 if (toReplace) 274 if (toReplace)
275 *toReplace = CSSProperty(prefixingVariant, property.value(), property.is Important(), property.shorthandID(), property.metadata().m_implicit); 275 *toReplace = CSSProperty(prefixingVariant, property.value(), property.is Important(), property.shorthandID(), property.metadata().m_implicit);
276 } 276 }
277 277
278 bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, int identifi er, bool important) 278 bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSValueID i dentifier, bool important)
279 { 279 {
280 setProperty(CSSProperty(propertyID, cssValuePool().createIdentifierValue(ide ntifier), important)); 280 setProperty(CSSProperty(propertyID, cssValuePool().createIdentifierValue(ide ntifier), important));
281 return true; 281 return true;
282 }
283
284 bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSPropertyI D identifier, bool important)
285 {
286 setProperty(CSSProperty(propertyID, cssValuePool().createIdentifierValue(ide ntifier), important));
287 return true;
282 } 288 }
283 289
284 void MutableStylePropertySet::parseDeclaration(const String& styleDeclaration, S tyleSheetContents* contextStyleSheet) 290 void MutableStylePropertySet::parseDeclaration(const String& styleDeclaration, S tyleSheetContents* contextStyleSheet)
285 { 291 {
286 m_propertyVector.clear(); 292 m_propertyVector.clear();
287 293
288 CSSParserContext context(cssParserMode()); 294 CSSParserContext context(cssParserMode());
289 if (contextStyleSheet) { 295 if (contextStyleSheet) {
290 context = contextStyleSheet->parserContext(); 296 context = contextStyleSheet->parserContext();
291 context.mode = cssParserMode(); 297 context.mode = cssParserMode();
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 result.appendLiteral(": "); 596 result.appendLiteral(": ");
591 result.append(propertyValue()->cssText()); 597 result.append(propertyValue()->cssText());
592 if (isImportant()) 598 if (isImportant())
593 result.appendLiteral(" !important"); 599 result.appendLiteral(" !important");
594 result.append(';'); 600 result.append(';');
595 return result.toString(); 601 return result.toString();
596 } 602 }
597 603
598 604
599 } // namespace WebCore 605 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/StylePropertySet.h ('k') | Source/core/dom/StyledElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698