Blink CompositorWorker: Use CompositorElementId and CompositorIdToElementMap.

third_party/WebKit/Source/core/dom/CompositorProxy.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/CompositorProxy.h"
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
-#include "core/dom/DOMNodeIds.h"
+#include "core/dom/CompositorIdToElementMap.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "platform/ThreadSafeFunctional.h"
 #include "platform/graphics/CompositorMutableProperties.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebTraceLocation.h"
 #include <algorithm>
 
 namespace blink {
 
@@ skipping 23 matching lines @@
 
 static bool isCallingCompositorFrameCallback()
 {
     // TODO(sad): Check that the requestCompositorFrame callbacks are currently being called.
     return true;
 }
 
 static void decrementCompositorProxiedPropertiesForElement(CompositorElementId elementId, uint32_t compositorMutableProperties)
 {
     DCHECK(isMainThread());
-    Node* node = DOMNodeIds::nodeForId(elementId);
-    if (!node)
+    Element* element = CompositorIdToElementMap::getById(elementId);
+    if (!element)
         return;
-    Element* element = toElement(node);
     element->decrementCompositorProxiedProperties(compositorMutableProperties);
 }
 
 static void incrementCompositorProxiedPropertiesForElement(CompositorElementId elementId, uint32_t compositorMutableProperties)
 {
     DCHECK(isMainThread());
-    Node* node = DOMNodeIds::nodeForId(elementId);
-    if (!node)
+    Element* element = CompositorIdToElementMap::getById(elementId);
+    if (!element)
         return;
-    Element* element = toElement(node);
     element->incrementCompositorProxiedProperties(compositorMutableProperties);
 }
 
 static bool raiseExceptionIfMutationNotAllowed(ExceptionState& exceptionState)
 {
     if (!isControlThread()) {
         exceptionState.throwDOMException(NoModificationAllowedError, "Cannot mutate a proxy attribute from the main page.");
         return true;
     }
     if (!isCallingCompositorFrameCallback()) {
@@ skipping 34 matching lines @@
 
     return new CompositorProxy(*element, attributeArray);
 }
 
 CompositorProxy* CompositorProxy::create(CompositorElementId elementId, uint32_t compositorMutableProperties)
 {
     return new CompositorProxy(elementId, compositorMutableProperties);
 }
 
 CompositorProxy::CompositorProxy(Element& element, const Vector<String>& attributeArray)
-    : m_elementId(DOMNodeIds::idForNode(&element))
+    : m_elementId(element.assignCompositorElementId())
     , m_compositorMutableProperties(compositorMutablePropertiesFromNames(attributeArray))
 {
     DCHECK(isMainThread());
     DCHECK(m_compositorMutableProperties);
 #if DCHECK_IS_ON()
     DCHECK(sanityCheckMutableProperties(m_compositorMutableProperties));
 #endif
+    CompositorIdToElementMap::registerElement(element);
 
     incrementCompositorProxiedPropertiesForElement(m_elementId, m_compositorMutableProperties);
 }
 
 CompositorProxy::CompositorProxy(CompositorElementId elementId, uint32_t compositorMutableProperties)
     : m_elementId(elementId)
     , m_compositorMutableProperties(compositorMutableProperties)
 {
     DCHECK(isControlThread());
 #if DCHECK_IS_ON()
@@ skipping 101 matching lines @@
 void CompositorProxy::disconnect()
 {
     m_connected = false;
     if (isMainThread())
         decrementCompositorProxiedPropertiesForElement(m_elementId, m_compositorMutableProperties);
     else
         Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&decrementCompositorProxiedPropertiesForElement, m_elementId, m_compositorMutableProperties));
 }
 
 } // namespace blink