Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(724)

Unified Diff: Source/web/WebMediaPlayerClientImpl.h

Issue 302093011: Oilpan: move the MediaPlayer and MediaPlayerClient objects to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Have MediaController weakly track its media elements Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/WebMediaPlayerClientImpl.h
diff --git a/Source/web/WebMediaPlayerClientImpl.h b/Source/web/WebMediaPlayerClientImpl.h
index 51cda0db29b767defcf7817b3e769600a4fc0f65..0d6825116f1fc7b4d905ef0593c290db4666239e 100644
--- a/Source/web/WebMediaPlayerClientImpl.h
+++ b/Source/web/WebMediaPlayerClientImpl.h
@@ -41,6 +41,7 @@
#include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/include/gpu/GrTexture.h"
#endif
+#include "platform/heap/Handle.h"
#include "platform/weborigin/KURL.h"
#include "wtf/OwnPtr.h"
#include "wtf/PassOwnPtr.h"
@@ -60,10 +61,10 @@ class WebGraphicsContext3D;
// This class serves as a bridge between WebCore::MediaPlayer and
// blink::WebMediaPlayer.
-class WebMediaPlayerClientImpl FINAL : public WebCore::MediaPlayer, public WebMediaPlayerClient {
-
+class WebMediaPlayerClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<WebMediaPlayerClientImpl>, public WebCore::MediaPlayer, public WebMediaPlayerClient {
+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WebMediaPlayerClientImpl);
public:
- static PassOwnPtr<WebCore::MediaPlayer> create(WebCore::MediaPlayerClient*);
+ static PassOwnPtrWillBeRawPtr<WebCore::MediaPlayer> create(WebCore::MediaPlayerClient*);
virtual ~WebMediaPlayerClientImpl();
@@ -93,6 +94,7 @@ public:
// MediaPlayer methods:
virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
+ virtual void detach() OVERRIDE;
virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMediaPlayer::CORSMode) OVERRIDE;
virtual void play() OVERRIDE;
virtual void pause() OVERRIDE;
@@ -120,12 +122,14 @@ public:
virtual WebCore::AudioSourceProvider* audioSourceProvider() OVERRIDE;
#endif
+ virtual void trace(WebCore::Visitor*) OVERRIDE;
+
private:
explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*);
WebCore::HTMLMediaElement& mediaElement() const;
- WebCore::MediaPlayerClient* m_client;
+ RawPtrWillBeMember<WebCore::MediaPlayerClient> m_client;
OwnPtr<WebMediaPlayer> m_webMediaPlayer;
WebCore::MediaPlayer::Preload m_preload;
double m_rate;
@@ -161,7 +165,7 @@ private:
// AudioSourceProviderImpl wraps a WebAudioSourceProvider.
// provideInput() calls into Chromium to get a rendered audio stream.
-
+ // FIXME: Oilpan: consider moving this object to the heap.
class AudioSourceProviderImpl FINAL : public WebCore::AudioSourceProvider {
public:
AudioSourceProviderImpl()

Powered by Google App Engine
This is Rietveld 408576698