Oilpan: move the MediaPlayer and MediaPlayerClient objects to the heap.

Source/web/WebMediaPlayerClientImpl.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "platform/audio/AudioSourceProvider.h"
 #include "platform/graphics/media/MediaPlayer.h"
 #include "public/platform/WebAudioSourceProviderClient.h"
 #include "public/platform/WebMediaPlayerClient.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #if OS(ANDROID)
 #include "third_party/skia/include/core/SkBitmap.h"
 #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"
 #include "wtf/ThreadingPrimitives.h"
 
 namespace WebCore {
 class AudioSourceProviderClient;
 class HTMLMediaElement;
 }
 
 namespace blink {
 
 class WebAudioSourceProvider;
 class WebContentDecryptionModule;
 class WebMediaPlayer;
 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();
 
     // WebMediaPlayerClient methods:
     virtual void networkStateChanged() OVERRIDE;
     virtual void readyStateChanged() OVERRIDE;
     virtual void timeChanged() OVERRIDE;
     virtual void repaint() OVERRIDE;
     virtual void durationChanged() OVERRIDE;
     virtual void sizeChanged() OVERRIDE;
     virtual double volume() const OVERRIDE;
     virtual void playbackStateChanged() OVERRIDE;
     virtual WebMediaPlayer::Preload preload() const OVERRIDE;
 
     // WebEncryptedMediaPlayerClient methods:
     virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) OVERRIDE;
     virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode) OVERRIDE;
     virtual void keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) OVERRIDE;
     virtual void keyNeeded(const WebString& contentType, const unsigned char* initData, unsigned initDataLength) OVERRIDE;
 
     virtual void setWebLayer(WebLayer*) OVERRIDE;
     virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE;
     virtual void removeTextTrack(WebInbandTextTrack*) OVERRIDE;
     virtual void mediaSourceOpened(WebMediaSource*) OVERRIDE;
     virtual void requestFullscreen() OVERRIDE;
     virtual void requestSeek(double) OVERRIDE;
 
     // 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;
     virtual bool supportsSave() const OVERRIDE;
     virtual double duration() const OVERRIDE;
     virtual double currentTime() const OVERRIDE;
     virtual void seek(double time) OVERRIDE;
     virtual bool seeking() const OVERRIDE;
     virtual double rate() const OVERRIDE;
     virtual void setRate(double) OVERRIDE;
     virtual bool paused() const OVERRIDE;
     virtual void setPoster(const WebCore::KURL&) OVERRIDE;
     virtual WebCore::MediaPlayer::NetworkState networkState() const OVERRIDE;
     virtual WebCore::MediaPlayer::ReadyState readyState() const OVERRIDE;
     virtual double maxTimeSeekable() const OVERRIDE;
     virtual WTF::PassRefPtr<WebCore::TimeRanges> buffered() const OVERRIDE;
     virtual bool didLoadingProgress() const OVERRIDE;
     virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&) OVERRIDE;
     virtual bool copyVideoTextureToPlatformTexture(WebGraphicsContext3D*, Platform3DObject texture, GLint level, GLenum type, GLenum internalFormat, bool premultiplyAlpha, bool flipY) OVERRIDE;
     virtual void setPreload(WebCore::MediaPlayer::Preload) OVERRIDE;
     virtual bool hasSingleSecurityOrigin() const OVERRIDE;
     virtual double mediaTimeForTimeValue(double timeValue) const OVERRIDE;
 
 #if ENABLE(WEB_AUDIO)
     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;

[haraken, 2014/06/03 05:31:08]

Nit: I think you'll need to move WebMediaPlayer to the heap in a follow-up and
I'm curious how things are reorganized then :)

[sof, 2014/06/03 05:45:44]

I don't understand what that means. We have moved what can be moved on the
renderer side by now. blink::WebMediaPlayer is something implemented by the
browser process, no?

[haraken, 2014/06/03 06:00:14]

oh, you're right; we cannot move blink::WebMediaPlayer to the heap.

     WebCore::MediaPlayer::Preload m_preload;
     double m_rate;
 
 #if OS(ANDROID)
     // FIXME: This path "only works" on Android. It is a workaround for the problem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES
     // texture internally. It should be removed and replaced by the normal paint path.
     // https://code.google.com/p/skia/issues/detail?id=1189
     void paintOnAndroid(WebCore::GraphicsContext*, const WebCore::IntRect&, uint8_t alpha);
     SkBitmap m_bitmap;
     bool m_usePaintOnAndroid;
@@ skipping 14 matching lines @@
 
         // WebAudioSourceProviderClient
         virtual void setFormat(size_t numberOfChannels, float sampleRate) OVERRIDE;
 
     private:
         WebCore::AudioSourceProviderClient* m_client;
     };
 
     // 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()
             : m_webAudioSourceProvider(0)
         {
         }
 
         virtual ~AudioSourceProviderImpl() { }
 
         // Wraps the given WebAudioSourceProvider.
         void wrap(WebAudioSourceProvider*);
 
         // WebCore::AudioSourceProvider
         virtual void setClient(WebCore::AudioSourceProviderClient*) OVERRIDE;
         virtual void provideInput(WebCore::AudioBus*, size_t framesToProcess) OVERRIDE;
 
     private:
         WebAudioSourceProvider* m_webAudioSourceProvider;
         OwnPtr<AudioClientImpl> m_client;
         Mutex provideInputLock;
     };
 
     AudioSourceProviderImpl m_audioSourceProvider;
 #endif
 };
 
 } // namespace blink
 
 #endif