Chromium Code Reviews| 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 3b5016323c869a33409d40292bce27f773b4597e..54b61dd4c734261f07ade8219966adfa390c921c 100644 |
| --- a/third_party/WebKit/Source/core/dom/CompositorProxy.h |
| +++ b/third_party/WebKit/Source/core/dom/CompositorProxy.h |
| @@ -10,7 +10,9 @@ |
| #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/PtrUtil.h" |
|
jbroman
2016/06/08 14:59:38
Unused header?
majidvp
2016/06/08 21:50:09
Done.
|
| #include "wtf/text/WTFString.h" |
| namespace blink { |
| @@ -29,7 +31,6 @@ public: |
| DEFINE_INLINE_TRACE() |
| { |
| - visitor->trace(m_transform); |
| visitor->trace(m_client); |
| } |
| @@ -37,6 +38,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(); |
| @@ -50,6 +52,8 @@ public: |
| void setScrollTop(double, ExceptionState&); |
| void setTransform(DOMMatrix*, ExceptionState&); |
| + void takeCompositorMutableState(std::unique_ptr<CompositorMutableState>); |
|
jbroman
2016/06/08 14:59:38
yutak will switch us to unique_ptr shortly, but fo
majidvp
2016/06/08 21:50:09
There was a PSA earlier that we should start using
jbroman
2016/06/08 21:54:56
OK, I'd missed that PSA, and was assuming it would
|
| + |
| protected: |
| CompositorProxy(Element&, const Vector<String>& attributeArray); |
| CompositorProxy(uint64_t element, uint32_t compositorMutableProperties, CompositorProxyClient*); |
| @@ -60,15 +64,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 |