Implement out-of-band video compositing on Android: Step 1

webkit/media/android/webmediaplayer_in_process_android.h

 // 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_IN_PROCESS_ANDROID_H_
 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IN_PROCESS_ANDROID_H_
 
 #include <string>
 
 #include <jni.h>
@@ skipping 34 matching lines @@
                           const GetCookieCB& callback) OVERRIDE;
 
 private:
   WebKit::WebCookieJar* cookie_jar_;
   DISALLOW_COPY_AND_ASSIGN(InProcessCookieGetter);
 };
 
 // This class implements WebKit::WebMediaPlayer by keeping the android
 // mediaplayer in the render process. This mode is being deprecated
 // as mediaplayer is going to be moved to the browser process.
 class WebMediaPlayerInProcessAndroid : public WebMediaPlayerAndroid {

[scherkus (not reviewing), 2013/03/07 00:09:13]

qinmin: any ETA when can we delete this code?

[qinmin, 2013/03/07 00:22:19]

hmm... I want to keep it for DRT tests. Sievers is working on the in-process
graphicsContext stuff for this. So if that works, and we can run DRT tests with
image diff on

[scherkus (not reviewing), 2013/03/07 00:28:56]

Will using content_shell for layout tests change the situation?

If this is a more involved Q&A we can chat about it offline / outside of this CL
:)

[no sievers, 2013/03/07 00:32:02]

Yes, I'd be a fan of running layout tests with the same architecture and
codepath as is normally used. 
I don't think it's worth keeping a separate media player implementation just for
tests. At some point you have to wonder if you are testing the right thing.

  public:
   // Construct a WebMediaPlayerInProcessAndroid object.
   WebMediaPlayerInProcessAndroid(
       WebKit::WebFrame* frame,
       WebKit::WebMediaPlayerClient* client,
       WebKit::WebCookieJar* cookie_jar,
       WebMediaPlayerManagerAndroid* manager,
       media::MediaPlayerBridgeManager* resource_manager,
       StreamTextureFactory* factory,
       bool disable_media_history_logging);
@@ skipping 18 matching lines @@
 
  private:
   // Methods inherited from WebMediaPlayerAndroid.
   virtual void InitializeMediaPlayer(GURL url) OVERRIDE;
   virtual void PlayInternal() OVERRIDE;
   virtual void PauseInternal() OVERRIDE;
   virtual void SeekInternal(base::TimeDelta time) OVERRIDE;
   virtual float GetCurrentTimeInternal() const OVERRIDE;
   virtual void ReleaseResourcesInternal() OVERRIDE;
   virtual void Destroy() OVERRIDE;
+  virtual void RequestExternalSurface() OVERRIDE;
 
   WebKit::WebFrame* const frame_;
 
   // Bridge to the android media player.
   scoped_ptr<media::MediaPlayerBridge> media_player_;
 
   // Whether playback has completed.
   float playback_completed_;
 
   // Pointer to the cookie jar to get the cookie for the media url.
   WebKit::WebCookieJar* cookie_jar_;
 
   // Manager for managing all the hardware player resources.
   media::MediaPlayerBridgeManager* resource_manager_;
 
   // Whether we should disable history logging.
   bool disable_history_logging_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerInProcessAndroid);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_IN_PROCESS_ANDROID_H_