Chromium Code Reviews| Index: third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.h |
| diff --git a/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.h b/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.h |
| index fa24f558fc5ac27779afcac8b4549c1b52f4e452..3407e6ad6eb02e0d0d530aa49b2372337864570f 100644 |
| --- a/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.h |
| +++ b/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.h |
| @@ -20,6 +20,7 @@ class ExecutionContext; |
| class HTMLMediaElement; |
| class LocalFrame; |
| class RemotePlaybackAvailability; |
| +class ScriptPromiseResolver; |
| class RemotePlayback final |
| : public RefCountedGarbageCollectedEventTargetWithInlineData<RemotePlayback> |
| @@ -38,6 +39,7 @@ public: |
| ExecutionContext* getExecutionContext() const override; |
| ScriptPromise getAvailability(ScriptState*); |
| + ScriptPromise connect(ScriptState*); |
| String state() const; |
| @@ -46,7 +48,7 @@ public: |
| DECLARE_VIRTUAL_TRACE(); |
| private: |
| - RemotePlayback(LocalFrame*, WebRemotePlaybackState, bool availability); |
| + explicit RemotePlayback(HTMLMediaElement&); |
| void stateChanged(WebRemotePlaybackState) override; |
| void availabilityChanged(bool available) override; |
| @@ -54,6 +56,8 @@ private: |
| WebRemotePlaybackState m_state; |
| bool m_availability; |
| HeapVector<Member<RemotePlaybackAvailability>> m_availabilityObjects; |
| + RawPtrWillBeWeakMember<HTMLMediaElement> m_mediaElement; |
|
philipj_slow
2016/03/24 07:31:57
Hmm, why weak? I guess that RawPtr is needed pre-O
mlamouri (slow - plz ping)
2016/03/24 10:47:06
+1. I believe oilpan will deal with the cycle:
htt
philipj_slow
2016/03/24 11:06:23
~HTMLMediaElement would be one way, or perhaps Wea
whywhat
2016/03/24 16:08:40
Sounds like if it's a Member in Oilpan world, it s
philipj_slow
2016/03/29 05:51:45
The trouble is that one can't really get the same
|
| + HeapVector<Member<ScriptPromiseResolver>> m_connectPromiseResolvers; |
| }; |
| } // namespace blink |