| 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 cbbe801a216311fcf0f565a5d4e0e1668f83d87a..cf69322d831aaf858bbe04f8c481da5bab500c0f 100644
|
| --- a/third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| +++ b/third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| @@ -10,6 +10,7 @@
|
| #include "core/dom/CompositorProxyClient.h"
|
| #include "core/dom/DOMMatrix.h"
|
| #include "core/dom/Element.h"
|
| +#include "platform/graphics/CompositorMutableState.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| @@ -28,7 +29,6 @@ public:
|
|
|
| DEFINE_INLINE_TRACE()
|
| {
|
| - visitor->trace(m_transform);
|
| visitor->trace(m_client);
|
| }
|
|
|
| @@ -36,6 +36,7 @@ public:
|
| uint32_t compositorMutableProperties() const { return m_compositorMutableProperties; }
|
| bool supports(const String& attribute) const;
|
|
|
| + bool initialized() const { return m_connected && m_state.get(); }
|
| bool connected() const { return m_connected; }
|
| void disconnect();
|
|
|
| @@ -49,6 +50,8 @@ public:
|
| void setScrollTop(double, ExceptionState&);
|
| void setTransform(DOMMatrix*, ExceptionState&);
|
|
|
| + void takeCompositorMutableState(std::unique_ptr<CompositorMutableState>);
|
| +
|
| protected:
|
| CompositorProxy(uint64_t elementId, uint32_t compositorMutableProperties);
|
| CompositorProxy(Element&, const Vector<String>& attributeArray);
|
| @@ -60,15 +63,10 @@ private:
|
|
|
| const uint64_t m_elementId = 0;
|
| const uint32_t m_compositorMutableProperties = 0;
|
| - uint32_t m_mutatedProperties = 0;
|
| -
|
| - double m_opacity = 0;
|
| - double m_scrollLeft = 0;
|
| - double m_scrollTop = 0;
|
| - Member<DOMMatrix> m_transform;
|
|
|
| bool m_connected = true;
|
| Member<CompositorProxyClient> m_client;
|
| + std::unique_ptr<CompositorMutableState> m_state;
|
| };
|
|
|
| } // namespace blink
|
|
|