Index: third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.h |
diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.h b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.h |
index b7e1d00fa209ab1ec3a9a8e0e8d13870e90cf305..b71b1ed35a8a04615be31967e834191151e79fc0 100644 |
--- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.h |
+++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.h |
@@ -5,20 +5,25 @@ |
#ifndef CompositorWorkerGlobalScope_h |
#define CompositorWorkerGlobalScope_h |
+#include "core/dom/CompositorProxyClient.h" |
#include "core/dom/FrameRequestCallbackCollection.h" |
#include "core/dom/MessagePort.h" |
#include "core/workers/WorkerGlobalScope.h" |
+#include "modules/ModulesExport.h" |
namespace blink { |
class CompositorWorkerThread; |
class WorkerThreadStartupData; |
-class CompositorWorkerGlobalScope final : public WorkerGlobalScope { |
+class MODULES_EXPORT CompositorWorkerGlobalScope final : public WorkerGlobalScope { |
DEFINE_WRAPPERTYPEINFO(); |
+ USING_PRE_FINALIZER(CompositorWorkerGlobalScope, dispose); |
+ |
public: |
static CompositorWorkerGlobalScope* create(CompositorWorkerThread*, PassOwnPtr<WorkerThreadStartupData>, double timeOrigin); |
~CompositorWorkerGlobalScope() override; |
+ void dispose(); |
// EventTarget |
const AtomicString& interfaceName() const override; |
@@ -28,7 +33,7 @@ public: |
int requestAnimationFrame(FrameRequestCallback*); |
void cancelAnimationFrame(int id); |
- void executeAnimationFrameCallbacks(double highResTimeNow); |
+ bool executeAnimationFrameCallbacks(double highResTimeNow); |
jbroman
2016/04/29 19:42:22
Please also change this parameter name to indicate
flackr
2016/05/03 22:24:54
Done.
|
// ExecutionContext: |
bool isCompositorWorkerGlobalScope() const override { return true; } |
@@ -39,6 +44,7 @@ private: |
CompositorWorkerGlobalScope(const KURL&, const String& userAgent, CompositorWorkerThread*, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData>, WorkerClients*); |
CompositorWorkerThread* thread() const; |
+ bool m_executingAnimationFrameCallbacks; |
FrameRequestCallbackCollection m_callbackCollection; |
}; |