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

Unified Diff: Source/core/animation/EffectInput.cpp

Issue 1153413007: Resolve style in element.animate() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add DOCTYPE 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/animation/EffectInput.cpp
diff --git a/Source/core/animation/EffectInput.cpp b/Source/core/animation/EffectInput.cpp
index ed925e3a4164f7b7eed8e091ecc235b5b6478cb8..afb7a59d68913067ead254c672b0aabc4cff0b6a 100644
--- a/Source/core/animation/EffectInput.cpp
+++ b/Source/core/animation/EffectInput.cpp
@@ -191,10 +191,14 @@ const QualifiedName* supportedSVGAttribute(const String& property, SVGElement* s
PassRefPtrWillBeRawPtr<EffectModel> EffectInput::convert(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)
{
- // FIXME: Remove the dependency on element.
if (!element)
return nullptr;
+ // TODO(alancutter): Remove this once composited animations no longer depend on AnimatableValues.
+ if (!element->inActiveDocument())
+ return nullptr;
+ element->document().updateLayoutTreeForNodeIfNeeded(element);
+
StyleSheetContents* styleSheetContents = element->document().elementSheet().contents();
StringKeyframeVector keyframes;
double lastOffset = 0;
« no previous file with comments | « LayoutTests/animations/composited-animation-style-update-expected.html ('k') | Source/core/animation/EffectInputTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698