| Index: Source/core/html/HTMLMediaElement.h
|
| diff --git a/Source/core/html/HTMLMediaElement.h b/Source/core/html/HTMLMediaElement.h
|
| index 9751bce17240837ee1b0724642488e6a6c1e1a40..bea6b3571b857780048f2d9950cf1a8da6521b02 100644
|
| --- a/Source/core/html/HTMLMediaElement.h
|
| +++ b/Source/core/html/HTMLMediaElement.h
|
| @@ -80,6 +80,7 @@ public:
|
| static bool isMediaStreamURL(const String& url);
|
|
|
| virtual void trace(Visitor*) OVERRIDE;
|
| + void clearWeakMembers(Visitor*);
|
|
|
| // Do not use player().
|
| // FIXME: Replace all uses with webMediaPlayer() and remove this API.
|
| @@ -367,7 +368,7 @@ private:
|
| void loadNextSourceChild();
|
| void userCancelledLoad();
|
| void clearMediaPlayer(int flags);
|
| - void clearMediaPlayerAndAudioSourceProviderClient();
|
| + void clearMediaPlayerAndAudioSourceProviderClientWithoutLocking();
|
| bool havePotentialSourceChild();
|
| void noneSupported();
|
| void mediaEngineError(PassRefPtrWillBeRawPtr<MediaError>);
|
| @@ -520,7 +521,8 @@ private:
|
|
|
| #if ENABLE(WEB_AUDIO)
|
| // This is a weak reference, since m_audioSourceNode holds a reference to us.
|
| - AudioSourceProviderClient* m_audioSourceNode;
|
| + // FIXME: Oilpan: Consider making this a strongly traced pointer with oilpan where strong cycles are not a problem.
|
| + RawPtrWillBeWeakMember<AudioSourceProviderClient> m_audioSourceNode;
|
| #endif
|
|
|
| friend class MediaController;
|
|
|