Upstream WebMediaPlayerAndroid as WebKit::WebMediaPlayer implementation on android.

webkit/media/android/webmediaplayer_proxy_android.h

Index: webkit/media/android/webmediaplayer_proxy_android.h
diff --git a/webkit/media/android/webmediaplayer_proxy_android.h b/webkit/media/android/webmediaplayer_proxy_android.h
new file mode 100644
index 0000000000000000000000000000000000000000..8b21e8d030bdb51f553218403511f7db488a2573
--- /dev/null
+++ b/webkit/media/android/webmediaplayer_proxy_android.h
@@ -0,0 +1,75 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+#define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+
+#include "base/memory/ref_counted.h"
+
+namespace base {
+class MessageLoopProxy;
+}
+
+namespace webkit_media {
+
+class WebMediaPlayerAndroid;
+
+// Acts as a thread proxy between media::MediaPlayerBridge and
+// WebMediaPlayerAndroid so that callbacks are posted onto the render thread.
+class WebMediaPlayerProxyAndroid
+    : public base::RefCountedThreadSafe<WebMediaPlayerProxyAndroid> {

[scherkus (not reviewing), 2012/04/17 03:57:31]

AFAIK this class can be vastly simplified if WMPA inherited from
SupportsWeakPtr<> since you're essentially re-writing code that can be
automagically generated for you!

you would then pass in a WeakPtr version of WMPA to this class, which would then
do the following:
void WebMediaPlayerProxyAndroid::PlaybackCompleteCallback() {
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxyAndroid::PlaybackCompleteTask,
weak_ptr_version_of_wmpa_));
}

that way instead of ~WMPA() you don't need to call SetWebMediaPlayer(NULL) and
you can delete half of this class

that also means you can likely pass in the instance of WMPA inside the
constructor of this class

[qinmin, 2012/04/18 20:06:30]

Done. SetWebMediaPlayer(NULL) actually can be called outside ~WMPA(). That
happens when we release the |mediaplayer| and do not want to receive any future
callbacks that are currently posted. 
I agree using WeakPtr is a better choice. And I am now putting the logic in
SetWebMediaPlayer(NULL) into WMPA.

On 2012/04/17 03:57:31, scherkus wrote:

+ public:
+  WebMediaPlayerProxyAndroid(
+      const scoped_refptr<base::MessageLoopProxy>& render_loop);
+
+  // Set the |webmediaplayer_| for callback.
+  void SetWebMediaPlayer(WebMediaPlayerAndroid* webmediaplayer);
+
+  // Callbacks from media::MediaPlayerBridge to WebMediaPlayerAndroid.
+  void MediaErrorCallback(int error_type);
+  void MediaInfoCallback(int info_type);
+  void VideoSizeChangedCallback(int width, int height);
+  void BufferingUpdateCallback(int percent);
+  void PlaybackCompleteCallback();
+  void SeekCompleteCallback();
+  void MediaPreparedCallback();
+
+ private:
+  friend class base::RefCountedThreadSafe<WebMediaPlayerProxyAndroid>;
+  virtual ~WebMediaPlayerProxyAndroid();
+
+  // Notify |webmediaplayer_| that an error has occured.
+  void MediaErrorTask(int error_type);
+
+  // Notify |webmediaplayer_| that some info has been received from
+  // media::MediaPlayerBridge.
+  void MediaInfoTask(int info_type);
+
+  // Notify |webmediaplayer_| that the video size has changed.
+  void VideoSizeChangedTask(int width, int height);
+
+  // Notify |webmediaplayer_| that an update in buffering has occured.
+  void BufferingUpdateTask(int percent);
+
+  // Notify |webmediaplayer_| that playback has completed.
+  void PlaybackCompleteTask();
+
+  // Notify |webmediaplayer_| that seek has completed.
+  void SeekCompleteTask();
+
+  // Notify |webmediaplayer_| that media has been prepared successfully.
+  void MediaPreparedTask();
+
+  // The WebMediaPlayerAndroid object all the callbacks should be send to.
+  WebMediaPlayerAndroid* webmediaplayer_;
+
+  // The render message loop where WebKit lives.
+  scoped_refptr<base::MessageLoopProxy> render_loop_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerProxyAndroid);
+};
+
+}  // namespace webkit_media
+
+#endif  // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_