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

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

Issue 1096963002: Make UseCounters work on aliased properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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/core/css/ComputedStyleCSSValueMapping.cpp ('k') | Source/core/css/StylePropertySet.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 Apple Inc. All r ights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 bool AbstractPropertySetCSSStyleDeclaration::isPropertyImplicit(const String& pr opertyName) 202 bool AbstractPropertySetCSSStyleDeclaration::isPropertyImplicit(const String& pr opertyName)
203 { 203 {
204 CSSPropertyID propertyID = cssPropertyID(propertyName); 204 CSSPropertyID propertyID = cssPropertyID(propertyName);
205 if (!propertyID) 205 if (!propertyID)
206 return false; 206 return false;
207 return propertySet().isPropertyImplicit(propertyID); 207 return propertySet().isPropertyImplicit(propertyID);
208 } 208 }
209 209
210 void AbstractPropertySetCSSStyleDeclaration::setProperty(const String& propertyN ame, const String& value, const String& priority, ExceptionState& exceptionState ) 210 void AbstractPropertySetCSSStyleDeclaration::setProperty(const String& propertyN ame, const String& value, const String& priority, ExceptionState& exceptionState )
211 { 211 {
212 CSSPropertyID propertyID = cssPropertyID(propertyName); 212 CSSPropertyID propertyID = unresolvedCSSPropertyID(propertyName);
213 if (!propertyID) 213 if (!propertyID)
214 return; 214 return;
215 215
216 bool important = equalIgnoringCase(priority, "important"); 216 bool important = equalIgnoringCase(priority, "important");
217 if (!important && !priority.isEmpty()) 217 if (!important && !priority.isEmpty())
218 return; 218 return;
219 219
220 setPropertyInternal(propertyID, value, important, exceptionState); 220 setPropertyInternal(propertyID, value, important, exceptionState);
221 } 221 }
222 222
(...skipping 19 matching lines...) Expand all
242 PassRefPtrWillBeRawPtr<CSSValue> AbstractPropertySetCSSStyleDeclaration::getProp ertyCSSValueInternal(CSSPropertyID propertyID) 242 PassRefPtrWillBeRawPtr<CSSValue> AbstractPropertySetCSSStyleDeclaration::getProp ertyCSSValueInternal(CSSPropertyID propertyID)
243 { 243 {
244 return propertySet().getPropertyCSSValue(propertyID); 244 return propertySet().getPropertyCSSValue(propertyID);
245 } 245 }
246 246
247 String AbstractPropertySetCSSStyleDeclaration::getPropertyValueInternal(CSSPrope rtyID propertyID) 247 String AbstractPropertySetCSSStyleDeclaration::getPropertyValueInternal(CSSPrope rtyID propertyID)
248 { 248 {
249 return propertySet().getPropertyValue(propertyID); 249 return propertySet().getPropertyValue(propertyID);
250 } 250 }
251 251
252 void AbstractPropertySetCSSStyleDeclaration::setPropertyInternal(CSSPropertyID p ropertyID, const String& value, bool important, ExceptionState&) 252 void AbstractPropertySetCSSStyleDeclaration::setPropertyInternal(CSSPropertyID u nresolvedProperty, const String& value, bool important, ExceptionState&)
253 { 253 {
254 StyleAttributeMutationScope mutationScope(this); 254 StyleAttributeMutationScope mutationScope(this);
255 willMutate(); 255 willMutate();
256 256
257 bool changed = propertySet().setProperty(propertyID, value, important, conte xtStyleSheet()); 257 bool changed = propertySet().setProperty(unresolvedProperty, value, importan t, contextStyleSheet());
258 258
259 didMutate(changed ? PropertyChanged : NoChanges); 259 didMutate(changed ? PropertyChanged : NoChanges);
260 260
261 if (changed) 261 if (changed)
262 mutationScope.enqueueMutationRecord(); 262 mutationScope.enqueueMutationRecord();
263 } 263 }
264 264
265 StyleSheetContents* AbstractPropertySetCSSStyleDeclaration::contextStyleSheet() const 265 StyleSheetContents* AbstractPropertySetCSSStyleDeclaration::contextStyleSheet() const
266 { 266 {
267 CSSStyleSheet* cssStyleSheet = parentStyleSheet(); 267 CSSStyleSheet* cssStyleSheet = parentStyleSheet();
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 } 387 }
388 #endif 388 #endif
389 389
390 DEFINE_TRACE(InlineCSSStyleDeclaration) 390 DEFINE_TRACE(InlineCSSStyleDeclaration)
391 { 391 {
392 visitor->trace(m_parentElement); 392 visitor->trace(m_parentElement);
393 AbstractPropertySetCSSStyleDeclaration::trace(visitor); 393 AbstractPropertySetCSSStyleDeclaration::trace(visitor);
394 } 394 }
395 395
396 } // namespace blink 396 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/ComputedStyleCSSValueMapping.cpp ('k') | Source/core/css/StylePropertySet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698