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

Side by Side Diff: Source/core/svg/SVGAnimateElement.cpp

Issue 15821009: Move property setting/removing/addParsedProperty/addParsedProperties functions to MutableStylePrope… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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/editing/EditingStyle.cpp ('k') | Source/core/svg/SVGElement.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 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
4 * Copyright (C) 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2008 Apple Inc. All rights reserved.
5 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2011. 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 if (!m_animatedType) 232 if (!m_animatedType)
233 m_animatedType = animator->constructFromString(baseValue); 233 m_animatedType = animator->constructFromString(baseValue);
234 else 234 else
235 m_animatedType->setValueAsString(attributeName, baseValue); 235 m_animatedType->setValueAsString(attributeName, baseValue);
236 } 236 }
237 237
238 static inline void applyCSSPropertyToTarget(SVGElement* targetElement, CSSProper tyID id, const String& value) 238 static inline void applyCSSPropertyToTarget(SVGElement* targetElement, CSSProper tyID id, const String& value)
239 { 239 {
240 ASSERT(!targetElement->m_deletionHasBegun); 240 ASSERT(!targetElement->m_deletionHasBegun);
241 241
242 StylePropertySet* propertySet = targetElement->ensureAnimatedSMILStyleProper ties(); 242 MutableStylePropertySet* propertySet = targetElement->ensureAnimatedSMILStyl eProperties();
243 if (!propertySet->setProperty(id, value, false, 0)) 243 if (!propertySet->setProperty(id, value, false, 0))
244 return; 244 return;
245 245
246 targetElement->setNeedsStyleRecalc(SyntheticStyleChange); 246 targetElement->setNeedsStyleRecalc(SyntheticStyleChange);
247 } 247 }
248 248
249 static inline void removeCSSPropertyFromTarget(SVGElement* targetElement, CSSPro pertyID id) 249 static inline void removeCSSPropertyFromTarget(SVGElement* targetElement, CSSPro pertyID id)
250 { 250 {
251 ASSERT(!targetElement->m_deletionHasBegun); 251 ASSERT(!targetElement->m_deletionHasBegun);
252 targetElement->ensureAnimatedSMILStyleProperties()->removeProperty(id); 252 targetElement->ensureAnimatedSMILStyleProperties()->removeProperty(id);
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 421
422 SVGAnimatedTypeAnimator* SVGAnimateElement::ensureAnimator() 422 SVGAnimatedTypeAnimator* SVGAnimateElement::ensureAnimator()
423 { 423 {
424 if (!m_animator) 424 if (!m_animator)
425 m_animator = SVGAnimatorFactory::create(this, targetElement(), m_animate dPropertyType); 425 m_animator = SVGAnimatorFactory::create(this, targetElement(), m_animate dPropertyType);
426 ASSERT(m_animatedPropertyType == m_animator->type()); 426 ASSERT(m_animatedPropertyType == m_animator->type());
427 return m_animator.get(); 427 return m_animator.get();
428 } 428 }
429 429
430 } 430 }
OLDNEW
« no previous file with comments | « Source/core/editing/EditingStyle.cpp ('k') | Source/core/svg/SVGElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698