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

Unified Diff: webkit/renderer/media/android/webmediaplayer_android.h

Issue 16327002: android: Implement single origin and CORS check for video (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nits. Created 7 years, 6 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 | « tools/metrics/histograms/histograms.xml ('k') | webkit/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/renderer/media/android/webmediaplayer_android.h
diff --git a/webkit/renderer/media/android/webmediaplayer_android.h b/webkit/renderer/media/android/webmediaplayer_android.h
index 4e625c129e7ad34afa042f791704ab66ac06c677..90b08852c7f36842709a75f127e427eaaf4ea5ef 100644
--- a/webkit/renderer/media/android/webmediaplayer_android.h
+++ b/webkit/renderer/media/android/webmediaplayer_android.h
@@ -25,6 +25,7 @@
#include "webkit/renderer/media/android/media_source_delegate.h"
#include "webkit/renderer/media/android/stream_texture_factory_android.h"
#include "webkit/renderer/media/crypto/proxy_decryptor.h"
+#include "webkit/renderer/media/media_info_loader.h"
namespace media {
class Demuxer;
@@ -254,6 +255,7 @@ class WebMediaPlayerAndroid
private:
void ReallocateVideoFrame();
+ void DidLoadMediaInfo(MediaInfoLoader::Status status);
// Actually do the work for generateKeyRequest/addKey so they can easily
// report results to UMA.
@@ -335,6 +337,10 @@ class WebMediaPlayerAndroid
// Whether the video size info is available.
bool has_size_info_;
+ // Whether the video metadata and info are available.
+ bool has_media_metadata_;
+ bool has_media_info_;
+
// Object for allocating stream textures.
scoped_ptr<StreamTextureFactory> stream_texture_factory_;
@@ -380,6 +386,8 @@ class WebMediaPlayerAndroid
media::MediaLog* media_log_;
MediaStreamClient* media_stream_client_;
+ scoped_ptr<MediaInfoLoader> info_loader_;
+
// The currently selected key system. Empty string means that no key system
// has been selected.
WebKit::WebString current_key_system_;
« no previous file with comments | « tools/metrics/histograms/histograms.xml ('k') | webkit/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698