1 files changed, 6 insertions, 7 deletions
diff --git a/chromium/third_party/blink/renderer/platform/graphics/compositor_mutator_impl.h b/chromium/third_party/blink/renderer/platform/graphics/compositor_mutator_impl.h
index fccc38928e4..3c589b49009 100644
--- a/chromium/third_party/blink/renderer/platform/graphics/compositor_mutator_impl.h
+++ b/chromium/third_party/blink/renderer/platform/graphics/compositor_mutator_impl.h
@@ -60,11 +60,11 @@ class PLATFORM_EXPORT CompositorMutatorImpl final : public CompositorMutator {
   void SetClient(CompositorMutatorClient* client) { client_ = client; }
 
  private:
-  using CompositorAnimators =
-      HashSet<CrossThreadPersistent<CompositorAnimator>>;
+  using CompositorAnimatorToTaskRunnerMap =
+      HashMap<CrossThreadPersistent<CompositorAnimator>,
+              scoped_refptr<base::SingleThreadTaskRunner>>;
 
   class AutoSignal {
-    WTF_MAKE_NONCOPYABLE(AutoSignal);
 
    public:
     explicit AutoSignal(WaitableEvent*);
@@ -72,11 +72,13 @@ class PLATFORM_EXPORT CompositorMutatorImpl final : public CompositorMutator {
 
    private:
     WaitableEvent* event_;
+
+    DISALLOW_COPY_AND_ASSIGN(AutoSignal);
   };
 
   // The AnimationWorkletProxyClientImpls are also owned by the WorkerClients
   // dictionary.
-  CompositorAnimators animators_;
+  CompositorAnimatorToTaskRunnerMap animator_map_;
 
   scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() {
     return mutator_queue_;
@@ -84,9 +86,6 @@ class PLATFORM_EXPORT CompositorMutatorImpl final : public CompositorMutator {
 
   scoped_refptr<base::SingleThreadTaskRunner> mutator_queue_;
 
-  // Currently we only support a single queue for animators.
-  scoped_refptr<base::SingleThreadTaskRunner> animator_queue_;
-
   // The CompositorMutatorClient owns (std::unique_ptr) us, so this pointer is
   // valid as long as this class exists.
   CompositorMutatorClient* client_;