| Index: third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| diff --git a/third_party/WebKit/Source/core/dom/CompositorProxy.h b/third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| index cbf97665072115c48045db6919c5cd836a409b38..cbbe801a216311fcf0f565a5d4e0e1668f83d87a 100644
|
| --- a/third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| +++ b/third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| @@ -6,6 +6,8 @@
|
| #define CompositorProxy_h
|
|
|
| #include "bindings/core/v8/ScriptWrappable.h"
|
| +#include "core/CoreExport.h"
|
| +#include "core/dom/CompositorProxyClient.h"
|
| #include "core/dom/DOMMatrix.h"
|
| #include "core/dom/Element.h"
|
| #include "platform/heap/Handle.h"
|
| @@ -17,16 +19,17 @@ class DOMMatrix;
|
| class ExceptionState;
|
| class ExecutionContext;
|
|
|
| -class CompositorProxy final : public GarbageCollectedFinalized<CompositorProxy>, public ScriptWrappable {
|
| +class CORE_EXPORT CompositorProxy final : public GarbageCollectedFinalized<CompositorProxy>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| static CompositorProxy* create(ExecutionContext*, Element*, const Vector<String>& attributeArray, ExceptionState&);
|
| - static CompositorProxy* create(uint64_t element, uint32_t compositorMutableProperties);
|
| + static CompositorProxy* create(ExecutionContext*, uint64_t element, uint32_t compositorMutableProperties);
|
| virtual ~CompositorProxy();
|
|
|
| DEFINE_INLINE_TRACE()
|
| {
|
| visitor->trace(m_transform);
|
| + visitor->trace(m_client);
|
| }
|
|
|
| uint64_t elementId() const { return m_elementId; }
|
| @@ -47,11 +50,13 @@ public:
|
| void setTransform(DOMMatrix*, ExceptionState&);
|
|
|
| protected:
|
| + CompositorProxy(uint64_t elementId, uint32_t compositorMutableProperties);
|
| CompositorProxy(Element&, const Vector<String>& attributeArray);
|
| - CompositorProxy(uint64_t element, uint32_t compositorMutableProperties);
|
| + CompositorProxy(uint64_t element, uint32_t compositorMutableProperties, CompositorProxyClient*);
|
|
|
| private:
|
| bool raiseExceptionIfNotMutable(uint32_t compositorMutableProperty, ExceptionState&) const;
|
| + void disconnectInternal();
|
|
|
| const uint64_t m_elementId = 0;
|
| const uint32_t m_compositorMutableProperties = 0;
|
| @@ -63,6 +68,7 @@ private:
|
| Member<DOMMatrix> m_transform;
|
|
|
| bool m_connected = true;
|
| + Member<CompositorProxyClient> m_client;
|
| };
|
|
|
| } // namespace blink
|
|
|