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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGElement.cpp

Issue 2567453002: Revert of Make InvalidatableInterpolation's InterpolationTypes decided at effect application time (Closed)
Patch Set: Created 4 years 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 | « third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp ('k') | no next file » | 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, 2006, 2007, 2008 Nikolas Zimmermann 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann
3 * <zimmermann@kde.org> 3 * <zimmermann@kde.org>
4 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> 4 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
5 * Copyright (C) 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 6 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
7 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> 7 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 15 matching lines...) Expand all
26 26
27 #include "bindings/core/v8/ScriptEventListener.h" 27 #include "bindings/core/v8/ScriptEventListener.h"
28 #include "core/HTMLNames.h" 28 #include "core/HTMLNames.h"
29 #include "core/SVGNames.h" 29 #include "core/SVGNames.h"
30 #include "core/XMLNames.h" 30 #include "core/XMLNames.h"
31 #include "core/animation/DocumentAnimations.h" 31 #include "core/animation/DocumentAnimations.h"
32 #include "core/animation/EffectStack.h" 32 #include "core/animation/EffectStack.h"
33 #include "core/animation/ElementAnimations.h" 33 #include "core/animation/ElementAnimations.h"
34 #include "core/animation/InterpolationEnvironment.h" 34 #include "core/animation/InterpolationEnvironment.h"
35 #include "core/animation/InvalidatableInterpolation.h" 35 #include "core/animation/InvalidatableInterpolation.h"
36 #include "core/animation/SVGInterpolationTypesMap.h"
37 #include "core/css/CSSCursorImageValue.h" 36 #include "core/css/CSSCursorImageValue.h"
38 #include "core/css/resolver/StyleResolver.h" 37 #include "core/css/resolver/StyleResolver.h"
39 #include "core/dom/Document.h" 38 #include "core/dom/Document.h"
40 #include "core/dom/ElementTraversal.h" 39 #include "core/dom/ElementTraversal.h"
41 #include "core/dom/shadow/ShadowRoot.h" 40 #include "core/dom/shadow/ShadowRoot.h"
42 #include "core/events/Event.h" 41 #include "core/events/Event.h"
43 #include "core/frame/Settings.h" 42 #include "core/frame/Settings.h"
44 #include "core/html/HTMLElement.h" 43 #include "core/html/HTMLElement.h"
45 #include "core/layout/LayoutObject.h" 44 #include "core/layout/LayoutObject.h"
46 #include "core/layout/svg/LayoutSVGResourceContainer.h" 45 #include "core/layout/svg/LayoutSVGResourceContainer.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 } 228 }
230 229
231 void SVGElement::applyActiveWebAnimations() { 230 void SVGElement::applyActiveWebAnimations() {
232 ActiveInterpolationsMap activeInterpolationsMap = 231 ActiveInterpolationsMap activeInterpolationsMap =
233 EffectStack::activeInterpolations( 232 EffectStack::activeInterpolations(
234 &elementAnimations()->effectStack(), nullptr, nullptr, 233 &elementAnimations()->effectStack(), nullptr, nullptr,
235 KeyframeEffectReadOnly::DefaultPriority, isSVGAttributeHandle); 234 KeyframeEffectReadOnly::DefaultPriority, isSVGAttributeHandle);
236 for (auto& entry : activeInterpolationsMap) { 235 for (auto& entry : activeInterpolationsMap) {
237 const QualifiedName& attribute = entry.key.svgAttribute(); 236 const QualifiedName& attribute = entry.key.svgAttribute();
238 InterpolationEnvironment environment( 237 InterpolationEnvironment environment(
239 SVGInterpolationTypesMap(), *this, 238 *this, propertyFromAttribute(attribute)->baseValueBase());
240 propertyFromAttribute(attribute)->baseValueBase());
241 InvalidatableInterpolation::applyStack(entry.value, environment); 239 InvalidatableInterpolation::applyStack(entry.value, environment);
242 } 240 }
243 svgRareData()->setWebAnimatedAttributesDirty(false); 241 svgRareData()->setWebAnimatedAttributesDirty(false);
244 } 242 }
245 243
246 static inline void notifyAnimValChanged(SVGElement* targetElement, 244 static inline void notifyAnimValChanged(SVGElement* targetElement,
247 const QualifiedName& attributeName) { 245 const QualifiedName& attributeName) {
248 targetElement->invalidateSVGAttributes(); 246 targetElement->invalidateSVGAttributes();
249 targetElement->svgAttributeChanged(attributeName); 247 targetElement->svgAttributeChanged(attributeName);
250 } 248 }
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1305 visitor->trace(m_className); 1303 visitor->trace(m_className);
1306 Element::trace(visitor); 1304 Element::trace(visitor);
1307 } 1305 }
1308 1306
1309 const AtomicString& SVGElement::eventParameterName() { 1307 const AtomicString& SVGElement::eventParameterName() {
1310 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt")); 1308 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
1311 return evtString; 1309 return evtString;
1312 } 1310 }
1313 1311
1314 } // namespace blink 1312 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698