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

Unified Diff: webkit/media/android/webmediaplayer_in_process_android.h

Issue 12892010: Remove WebMediaPlayerInProcessAndroid (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | webkit/media/android/webmediaplayer_in_process_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/android/webmediaplayer_in_process_android.h
diff --git a/webkit/media/android/webmediaplayer_in_process_android.h b/webkit/media/android/webmediaplayer_in_process_android.h
deleted file mode 100644
index fcc3d95d0123355ed77fa772c9c787e5deabeba7..0000000000000000000000000000000000000000
--- a/webkit/media/android/webmediaplayer_in_process_android.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// 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>
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/base/android/media_resource_getter.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
-#include "webkit/media/android/webmediaplayer_android.h"
-
-namespace WebKit {
-class WebCookieJar;
-class WebFrame;
-}
-
-namespace media {
-class MediaPlayerBridge;
-class MediaPlayerBridgeManager;
-}
-
-namespace webkit_media {
-
-class StreamTextureFactory;
-class WebMediaPlayerManagerAndroid;
-
-// Class for retrieving the media resources.
-class InProcessMediaResourceGetter
- : public media::MediaResourceGetter {
- public:
- // Construct an InProcessCookieGetter object from a WebCookieJar.
- explicit InProcessMediaResourceGetter(WebKit::WebCookieJar* cookie_jar);
- virtual ~InProcessMediaResourceGetter();
-
- // media::CookieGetter implementation.
- virtual void GetCookies(const GURL& url,
- const GURL& first_party_for_cookies,
- const GetCookieCB& callback) OVERRIDE;
- virtual void GetPlatformPathFromFileSystemURL(
- const GURL& url,
- const GetPlatformPathCB& callback) OVERRIDE;
-
-private:
- WebKit::WebCookieJar* cookie_jar_;
- DISALLOW_COPY_AND_ASSIGN(InProcessMediaResourceGetter);
-};
-
-// 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/21 20:07:18 can we merge the WebMediaPlayerAndroid base class
qinmin 2013/03/21 20:08:09 Yes, I am planning to do that in a seperate CL On
scherkus (not reviewing) 2013/03/21 20:48:27 Great!
- 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);
- virtual ~WebMediaPlayerInProcessAndroid();
-
- // Getters of playback state.
- virtual bool paused() const;
-
- // Callbacks from media::MediaPlayerBridge to WebMediaPlayerInProcessAndroid.
- void MediaErrorCallback(int player_id, int error_type);
- void VideoSizeChangedCallback(int player_id, int width, int height);
- void BufferingUpdateCallback(int player_id, int percent);
- void PlaybackCompleteCallback(int player_id);
- void SeekCompleteCallback(int player_id, base::TimeDelta current_time);
- void MediaPreparedCallback(int player_id, base::TimeDelta duration);
- void TimeUpdateCallback(int player_id, base::TimeDelta current_time) {}
- void MediaInterruptedCallback(int player_id);
-
- // WebMediaPlayerAndroid implementation.
- virtual void SetVideoSurface(jobject j_surface) OVERRIDE;
- virtual void OnTimeUpdate(base::TimeDelta current_time) OVERRIDE;
-
- 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_
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | webkit/media/android/webmediaplayer_in_process_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698