Chromium Code Reviews| 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 f477ca2bcabce6c21fc276dd52f500bc44077150..daecf723b70d7bb09ff41b52bee97e171c0ab072 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,11 @@ bool CompositorProxyClientImpl::mutate(double monotonicTimeNow) |
| if (!m_requestedAnimationFrameCallbacks) |
| return false; |
| + // Update proxies mutable state for this frame and reset it after rAF |
| + // callback as no mutation is allowed outside rAF. |
| + updateMutableStateForCompositorProxies(stateProvider); |
|
aelias_OOO_until_Jul13
2016/06/15 18:40:54
Please make a small RAII class called like ScopedC
majidvp
2016/06/16 02:53:54
Added a class please take a look.
|
| m_requestedAnimationFrameCallbacks = executeAnimationFrameCallbacks(monotonicTimeNow); |
| + updateMutableStateForCompositorProxies(nullptr); |
| return m_requestedAnimationFrameCallbacks; |
| } |
| @@ -59,10 +64,16 @@ 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 (CompositorProxy* proxy : m_proxies) |
| + proxy->takeCompositorMutableState(stateProvider ? stateProvider->getMutableStateFor(proxy->elementId()) : nullptr); |
| } |
| void CompositorProxyClientImpl::registerCompositorProxy(CompositorProxy* proxy) |