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/media/android/webmediaplayer_in_process_android.cc

Issue 12595005: Parsing filesystem url before giving it to media player (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
Index: webkit/media/android/webmediaplayer_in_process_android.cc
diff --git a/webkit/media/android/webmediaplayer_in_process_android.cc b/webkit/media/android/webmediaplayer_in_process_android.cc
index 6bd9c58da3af48c18bbe7e3d91695e16aa169f77..5c0cd88c198cedabde66371ca38162b9edce4ac6 100644
--- a/webkit/media/android/webmediaplayer_in_process_android.cc
+++ b/webkit/media/android/webmediaplayer_in_process_android.cc
@@ -23,13 +23,14 @@ using media::MediaPlayerBridge;
namespace webkit_media {
-InProcessCookieGetter::InProcessCookieGetter(WebKit::WebCookieJar* cookie_jar)
+InProcessMediaResourceGetter::InProcessMediaResourceGetter(
+ WebKit::WebCookieJar* cookie_jar)
: cookie_jar_(cookie_jar) {
}
-InProcessCookieGetter::~InProcessCookieGetter() {}
+InProcessMediaResourceGetter::~InProcessMediaResourceGetter() {}
-void InProcessCookieGetter::GetCookies(
+void InProcessMediaResourceGetter::GetCookies(
const std::string& url,
const std::string& first_party_for_cookies,
const GetCookieCB& callback) {
@@ -41,6 +42,11 @@ void InProcessCookieGetter::GetCookies(
callback.Run(cookies);
}
+void InProcessMediaResourceGetter::GetPlatformPathFromFileSystemURL(
+ const std::string& url, const GetPlatformPathCB& callback) {
+ callback.Run(std::string());
+}
+
WebMediaPlayerInProcessAndroid::WebMediaPlayerInProcessAndroid(
WebKit::WebFrame* frame,
WebMediaPlayerClient* client,
@@ -136,7 +142,7 @@ void WebMediaPlayerInProcessAndroid::InitializeMediaPlayer(GURL url) {
GURL first_party_url = frame_->document().firstPartyForCookies();
media_player_.reset(new MediaPlayerBridge(
player_id(), url.spec(), first_party_url.spec(),
- new InProcessCookieGetter(cookie_jar_),
+ new InProcessMediaResourceGetter(cookie_jar_),
disable_history_logging_,
resource_manager_,
base::Bind(&WebMediaPlayerInProcessAndroid::MediaErrorCallback,

Powered by Google App Engine
This is Rietveld 408576698