CC Animation: Unify ElementId in Blink Compositor Worker.

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/ExceptionCode.h"
@@ skipping 29 matching lines @@
 {
     return !isMainThread();
 }
 
 static bool isCallingCompositorFrameCallback()
 {
     // TODO(sad): Check that the requestCompositorFrame callbacks are currently being called.
     return true;
 }
 
-static void decrementCompositorProxiedPropertiesForElement(uint64_t elementId, uint32_t compositorMutableProperties)
+static void decrementCompositorProxiedPropertiesForElement(CompositorElementId elementId, uint32_t compositorMutableProperties)
 {
     DCHECK(isMainThread());
     Node* node = DOMNodeIds::nodeForId(elementId);
     if (!node)
         return;
     Element* element = toElement(node);
     element->decrementCompositorProxiedProperties(compositorMutableProperties);
 }
 
-static void incrementCompositorProxiedPropertiesForElement(uint64_t elementId, uint32_t compositorMutableProperties)
+static void incrementCompositorProxiedPropertiesForElement(CompositorElementId elementId, uint32_t compositorMutableProperties)
 {
     DCHECK(isMainThread());
     Node* node = DOMNodeIds::nodeForId(elementId);
     if (!node)
         return;
     Element* element = toElement(node);
     element->incrementCompositorProxiedProperties(compositorMutableProperties);
 }
 
 static bool raiseExceptionIfMutationNotAllowed(ExceptionState& exceptionState)
@@ skipping 34 matching lines @@
 {
     if (!context->isDocument()) {
         exceptionState.throwTypeError(ExceptionMessages::failedToConstruct("CompositorProxy", "Can only be created from the main context."));
         exceptionState.throwIfNeeded();
         return nullptr;
     }
 
     return new CompositorProxy(*element, attributeArray);
 }
 
-CompositorProxy* CompositorProxy::create(uint64_t elementId, uint32_t compositorMutableProperties)
+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_compositorMutableProperties(compositorMutablePropertiesFromNames(attributeArray))
 {
     DCHECK(isMainThread());
     DCHECK(m_compositorMutableProperties);
 #if DCHECK_IS_ON()
     DCHECK(sanityCheckMutableProperties(m_compositorMutableProperties));
 #endif
 
     incrementCompositorProxiedPropertiesForElement(m_elementId, m_compositorMutableProperties);
 }
 
-CompositorProxy::CompositorProxy(uint64_t elementId, uint32_t compositorMutableProperties)
+CompositorProxy::CompositorProxy(CompositorElementId elementId, uint32_t compositorMutableProperties)
     : m_elementId(elementId)
     , m_compositorMutableProperties(compositorMutableProperties)
 {
     DCHECK(isControlThread());
 #if DCHECK_IS_ON()
     DCHECK(sanityCheckMutableProperties(m_compositorMutableProperties));
 #endif
     Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&incrementCompositorProxiedPropertiesForElement, m_elementId, m_compositorMutableProperties));
 }
 
@@ skipping 96 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