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

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

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Some small fixes to (hopefully) fix some broken tests Created 5 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, 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 String result; 232 String result;
233 bool changed = propertySet().removeProperty(propertyID, &result); 233 bool changed = propertySet().removeProperty(propertyID, &result);
234 234
235 didMutate(changed ? PropertyChanged : NoChanges); 235 didMutate(changed ? PropertyChanged : NoChanges);
236 236
237 if (changed) 237 if (changed)
238 mutationScope.enqueueMutationRecord(); 238 mutationScope.enqueueMutationRecord();
239 return result; 239 return result;
240 } 240 }
241 241
242 PassRefPtrWillBeRawPtr<CSSValue> AbstractPropertySetCSSStyleDeclaration::getProp ertyCSSValueInternal(CSSPropertyID propertyID) 242 NullableCSSValue AbstractPropertySetCSSStyleDeclaration::getPropertyCSSValueInte rnal(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 u nresolvedProperty, const String& value, bool important, ExceptionState&) 252 void AbstractPropertySetCSSStyleDeclaration::setPropertyInternal(CSSPropertyID u nresolvedProperty, const String& value, bool important, ExceptionState&)
(...skipping 13 matching lines...) Expand all
266 { 266 {
267 CSSStyleSheet* cssStyleSheet = parentStyleSheet(); 267 CSSStyleSheet* cssStyleSheet = parentStyleSheet();
268 return cssStyleSheet ? cssStyleSheet->contents() : 0; 268 return cssStyleSheet ? cssStyleSheet->contents() : 0;
269 } 269 }
270 270
271 PassRefPtrWillBeRawPtr<MutableStylePropertySet> AbstractPropertySetCSSStyleDecla ration::copyProperties() const 271 PassRefPtrWillBeRawPtr<MutableStylePropertySet> AbstractPropertySetCSSStyleDecla ration::copyProperties() const
272 { 272 {
273 return propertySet().mutableCopy(); 273 return propertySet().mutableCopy();
274 } 274 }
275 275
276 bool AbstractPropertySetCSSStyleDeclaration::cssPropertyMatches(CSSPropertyID pr opertyID, const CSSValue* propertyValue) const 276 bool AbstractPropertySetCSSStyleDeclaration::cssPropertyMatches(CSSPropertyID pr opertyID, const CSSValue propertyValue) const
277 { 277 {
278 return propertySet().propertyMatches(propertyID, propertyValue); 278 return propertySet().propertyMatches(propertyID, propertyValue);
279 } 279 }
280 280
281 DEFINE_TRACE(AbstractPropertySetCSSStyleDeclaration) 281 DEFINE_TRACE(AbstractPropertySetCSSStyleDeclaration)
282 { 282 {
283 CSSStyleDeclaration::trace(visitor); 283 CSSStyleDeclaration::trace(visitor);
284 } 284 }
285 285
286 StyleRuleCSSStyleDeclaration::StyleRuleCSSStyleDeclaration(MutableStylePropertyS et& propertySetArg, CSSRule* parentRule) 286 StyleRuleCSSStyleDeclaration::StyleRuleCSSStyleDeclaration(MutableStylePropertyS et& propertySetArg, CSSRule* parentRule)
(...skipping 100 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

Powered by Google App Engine
This is Rietveld 408576698