| Index: third_party/WebKit/Source/web/CompositorProxyClientImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/CompositorProxyClientImpl.cpp b/third_party/WebKit/Source/web/CompositorProxyClientImpl.cpp
|
| index 883114a745d01ad84833162d057786e2e661fa75..0aaa72776eb480500d0a286b14c6f0d460518e8b 100644
|
| --- a/third_party/WebKit/Source/web/CompositorProxyClientImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/CompositorProxyClientImpl.cpp
|
| @@ -7,6 +7,7 @@
|
| #include "core/dom/CompositorProxy.h"
|
| #include "modules/compositorworker/CompositorWorkerGlobalScope.h"
|
| #include "platform/TraceEvent.h"
|
| +#include "platform/graphics/CompositorMutableStateProvider.h"
|
| #include "web/CompositorMutatorImpl.h"
|
| #include "wtf/CurrentTime.h"
|
|
|
| @@ -42,7 +43,7 @@ void CompositorProxyClientImpl::requestAnimationFrame()
|
| m_mutator->setNeedsMutate();
|
| }
|
|
|
| -bool CompositorProxyClientImpl::mutate(double monotonicTimeNow)
|
| +bool CompositorProxyClientImpl::mutate(double monotonicTimeNow, CompositorMutableStateProvider* stateProvider)
|
| {
|
| if (!m_globalScope)
|
| return false;
|
| @@ -51,7 +52,9 @@ bool CompositorProxyClientImpl::mutate(double monotonicTimeNow)
|
| if (!m_requestedAnimationFrameCallbacks)
|
| return false;
|
|
|
| + updateMutableStateForCompositorProxies(stateProvider);
|
| m_requestedAnimationFrameCallbacks = executeAnimationFrameCallbacks(monotonicTimeNow);
|
| + updateMutableStateForCompositorProxies(nullptr);
|
|
|
| return m_requestedAnimationFrameCallbacks;
|
| }
|
| @@ -59,10 +62,18 @@ bool CompositorProxyClientImpl::mutate(double monotonicTimeNow)
|
| bool CompositorProxyClientImpl::executeAnimationFrameCallbacks(double monotonicTimeNow)
|
| {
|
| TRACE_EVENT0("compositor-worker", "CompositorProxyClientImpl::executeAnimationFrameCallbacks");
|
| +
|
| // Convert to zero based document time in milliseconds consistent with requestAnimationFrame.
|
| double highResTimeMs = 1000.0 * (monotonicTimeNow - m_globalScope->timeOrigin());
|
| - const bool shouldReinvoke = m_globalScope->executeAnimationFrameCallbacks(highResTimeMs);
|
| - return shouldReinvoke;
|
| + return m_globalScope->executeAnimationFrameCallbacks(highResTimeMs);
|
| +}
|
| +
|
| +void CompositorProxyClientImpl::updateMutableStateForCompositorProxies(CompositorMutableStateProvider* stateProvider)
|
| +{
|
| + for (auto iter : m_proxies) {
|
| + for (CompositorProxy* proxy : *iter.value)
|
| + proxy->takeCompositorMutableState(stateProvider ? stateProvider->getMutableStateFor(iter.key) : nullptr);
|
| + }
|
| }
|
|
|
| void CompositorProxyClientImpl::registerCompositorProxy(CompositorProxy* proxy)
|
|
|