Chromium Code Reviews| Index: Source/core/animation/EffectInput.cpp |
| diff --git a/Source/core/animation/EffectInput.cpp b/Source/core/animation/EffectInput.cpp |
| index ed925e3a4164f7b7eed8e091ecc235b5b6478cb8..6aa4ae5e12ed9a5f7f9f89b9b649021d34932262 100644 |
| --- a/Source/core/animation/EffectInput.cpp |
| +++ b/Source/core/animation/EffectInput.cpp |
| @@ -189,12 +189,18 @@ const QualifiedName* supportedSVGAttribute(const String& property, SVGElement* s |
| } // namespace |
| -PassRefPtrWillBeRawPtr<EffectModel> EffectInput::convert(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState) |
| +PassRefPtrWillBeRawPtr<EffectModel> EffectInput::convert(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState, bool unsafe) |
| { |
| - // FIXME: Remove the dependency on element. |
| if (!element) |
| return nullptr; |
| + // TODO(alancutter): Remove this once composited animations no longer depend on AnimatableValues. |
| + if (!unsafe) { |
| + if (!element->inActiveDocument()) |
|
esprehn
2015/06/04 06:18:09
This unsafe thing just for unit tests seems bad, t
|
| + return nullptr; |
| + element->document().updateLayoutTreeForNodeIfNeeded(element); |
| + } |
| + |
| StyleSheetContents* styleSheetContents = element->document().elementSheet().contents(); |
| StringKeyframeVector keyframes; |
| double lastOffset = 0; |