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

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: No CORS/redirect check when using media source. Created 7 years, 7 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
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 44ff9faefbda4a80c0da631af0bdf135d12e3eae..daa64ac223e3d2d47751552ae8e01a68d79656de 100644
--- a/webkit/renderer/media/android/webmediaplayer_android.h
+++ b/webkit/renderer/media/android/webmediaplayer_android.h
@@ -20,6 +20,7 @@
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
#include "ui/gfx/rect_f.h"
+#include "webkit/renderer/media/android/media_info_loader_android.h"
#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"
@@ -244,6 +245,8 @@ class WebMediaPlayerAndroid
private:
void ReallocateVideoFrame();
+ void InitializeProxy(bool is_media_source);
+ void DidLoadMediaInfo(MediaInfoLoaderAndroid::Status status);
#if defined(GOOGLE_TV)
// Actually do the work for generateKeyRequest/addKey so they can easily
@@ -359,6 +362,8 @@ class WebMediaPlayerAndroid
media::MediaLog* media_log_;
+ scoped_ptr<MediaInfoLoaderAndroid> info_loader_;
+
// The currently selected key system. Empty string means that no key system
// has been selected.
WebKit::WebString current_key_system_;

Powered by Google App Engine
This is Rietveld 408576698