| 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 37efc8446b9c7ccaee8fc3a31b967010ae1fd374..1cd8ac5631f5189200d97884a5e3257c08cc8309 100644
|
| --- a/third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| +++ b/third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| @@ -31,13 +31,15 @@ class CORE_EXPORT CompositorProxy final
|
| const Vector<String>& attributeArray,
|
| ExceptionState&);
|
| static CompositorProxy* create(ExecutionContext*,
|
| - uint64_t element,
|
| + uint64_t elementId,
|
| + uint64_t scrollingNodeId,
|
| uint32_t compositorMutableProperties);
|
| virtual ~CompositorProxy();
|
|
|
| DEFINE_INLINE_TRACE() {}
|
|
|
| uint64_t elementId() const { return m_elementId; }
|
| + uint64_t scrollingNodeId() const { return m_scrollingNodeId; }
|
| uint32_t compositorMutableProperties() const {
|
| return m_compositorMutableProperties;
|
| }
|
| @@ -60,9 +62,14 @@ class CORE_EXPORT CompositorProxy final
|
| void takeCompositorMutableState(std::unique_ptr<CompositorMutableState>);
|
|
|
| protected:
|
| - CompositorProxy(uint64_t elementId, uint32_t compositorMutableProperties);
|
| - CompositorProxy(Element&, const Vector<String>& attributeArray);
|
| + CompositorProxy(uint64_t elementId,
|
| + uint64_t scrollingNodeId,
|
| + uint32_t compositorMutableProperties);
|
| + CompositorProxy(Element&,
|
| + Node& scrollingNode,
|
| + const Vector<String>& attributeArray);
|
| CompositorProxy(uint64_t element,
|
| + uint64_t scrollingNodeId,
|
| uint32_t compositorMutableProperties,
|
| CompositorProxyClient*);
|
|
|
| @@ -72,6 +79,7 @@ class CORE_EXPORT CompositorProxy final
|
| void disconnectInternal();
|
|
|
| const uint64_t m_elementId = 0;
|
| + const uint64_t m_scrollingNodeId = 0;
|
| const uint32_t m_compositorMutableProperties = 0;
|
|
|
| bool m_connected = true;
|
|
|