Chromium Code Reviews| Index: third_party/WebKit/Source/core/dom/Element.cpp |
| diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp |
| index 53f79f17c4adc0595dfb52e20d5efb9f1b326e54..4bc6d82496aceb63c1be4fe108ddc980686cf55f 100644 |
| --- a/third_party/WebKit/Source/core/dom/Element.cpp |
| +++ b/third_party/WebKit/Source/core/dom/Element.cpp |
| @@ -36,6 +36,7 @@ |
| #include "core/SVGNames.h" |
| #include "core/XMLNames.h" |
| #include "core/animation/AnimationTimeline.h" |
| +#include "core/animation/CustomCompositorAnimations.h" |
| #include "core/animation/css/CSSAnimations.h" |
| #include "core/css/CSSImageValue.h" |
| #include "core/css/CSSStyleSheet.h" |
| @@ -126,6 +127,7 @@ |
| #include "platform/RuntimeEnabledFeatures.h" |
| #include "platform/UserGestureIndicator.h" |
| #include "platform/graphics/CompositorMutableProperties.h" |
| +#include "platform/graphics/CompositorMutation.h" |
| #include "platform/scroll/ScrollableArea.h" |
| #include "wtf/BitVector.h" |
| #include "wtf/HashFunctions.h" |
| @@ -950,6 +952,13 @@ void Element::decrementCompositorProxiedProperties(uint32_t mutableProperties) |
| setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::CompositorProxy)); |
| } |
| +void Element::updateFromCompositorMutation(const CompositorMutation& mutation) |
| +{ |
| + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "Element::updateFromCompositorMutation"); |
| + if (mutation.isOpacityMutated() || mutation.isTransformMutated()) |
|
esprehn
2016/03/22 21:16:49
how do we get here with neither of those mutated?
majidvp
2016/03/23 22:24:53
Scroll{Top,Left} may also be mutated. Those are sy
|
| + ensureElementAnimations().customCompositorAnimations().applyUpdate(*this, mutation); |
| +} |
| + |
| uint32_t Element::compositorMutableProperties() const |
| { |
| if (!hasRareData()) |