[compositorworker] Register compositor proxies with proxy client

third_party/WebKit/Source/web/CompositorProxyClientImpl.h

Index: third_party/WebKit/Source/web/CompositorProxyClientImpl.h
diff --git a/third_party/WebKit/Source/web/CompositorProxyClientImpl.h b/third_party/WebKit/Source/web/CompositorProxyClientImpl.h
index 767117edd37e7750ebb97832ab30f914d5746c9a..3a0f65e7cc5f9fff2fa8f41889c435395ef6cfbd 100644
--- a/third_party/WebKit/Source/web/CompositorProxyClientImpl.h
+++ b/third_party/WebKit/Source/web/CompositorProxyClientImpl.h
@@ -6,6 +6,7 @@
 #define CompositorProxyClientImpl_h
 
 #include "core/dom/CompositorProxyClient.h"
+#include "platform/heap/Handle.h"
 #include "wtf/Noncopyable.h"
 
 namespace blink {
@@ -19,7 +20,7 @@ class WorkerGlobalScope;
 // mutator, e.g. if a single document creates multiple CompositorWorker objects.
 //
 // Should be accessed only on the compositor thread.
-class CompositorProxyClientImpl final : public GarbageCollected<CompositorProxyClientImpl>, public CompositorProxyClient {
+class CompositorProxyClientImpl final : public GarbageCollectedFinalized<CompositorProxyClientImpl>, public CompositorProxyClient {

[jbroman, 2016/06/10 17:45:42]

Why did this class become GarbageCollectedFinalized? I only see the addition of
a GC-ed member, which shouldn't require finalization.

[majidvp, 2016/06/10 19:17:51]

Hmmm, I recall getting warning from oilpan that it was needed but I don't
anymore.
So removed.

     USING_GARBAGE_COLLECTED_MIXIN(CompositorProxyClientImpl);
     WTF_MAKE_NONCOPYABLE(CompositorProxyClientImpl);
 public:
@@ -33,6 +34,8 @@ public:
     // CompositorProxyClient:
     void setGlobalScope(WorkerGlobalScope*) override;
     void requestAnimationFrame() override;
+    void registerCompositorProxy(CompositorProxy*) override;
+    void unregisterCompositorProxy(CompositorProxy*) override;
 
 private:
     bool executeAnimationFrameCallbacks(double monotonicTimeNow);
@@ -41,6 +44,10 @@ private:
 
     Member<CompositorWorkerGlobalScope> m_globalScope;
     bool m_requestedAnimationFrameCallbacks;
+
+    typedef HeapHashSet<WeakMember<CompositorProxy>> ProxySet;
+    typedef HeapHashMap<uint64_t, Member<ProxySet>> ProxyMap;
+    ProxyMap m_proxyMap;
 };
 
 } // namespace blink