webkit/media/android/webmediaplayer_android.h - Issue 10543007: Add CORS-awareness to HTML5 media elements.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10543007: Add CORS-awareness to HTML5 media elements. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 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:

Index: webkit/media/android/webmediaplayer_android.h

diff --git a/webkit/media/android/webmediaplayer_android.h b/webkit/media/android/webmediaplayer_android.h

index b948d362f6f4ced83d07cb6a3417f6e5ebf2bc96..90bc9ef4a80a8de25bf3d608c16b109b34a023a1 100644

--- a/webkit/media/android/webmediaplayer_android.h

+++ b/webkit/media/android/webmediaplayer_android.h

@@ -50,8 +50,13 @@ class WebMediaPlayerAndroid :

// Set |incognito_mode_| to true if in incognito mode.

static void InitIncognito(bool incognito_mode);

- // Resource loading.

+ // TODO(fischman): remove the single-param version once WebKit stops calling

+ // it.

virtual void load(const WebKit::WebURL& url);

+ // Resource loading.

+ virtual void load(const WebKit::WebURL& url,

+ bool has_cross_origin_attr,

+ const WebKit::WebString& cross_origin_attr);

scherkus (not reviewing) 2012/06/06 00:44:36 CrossOriginAttribute cross_origin_attribute instea

virtual void cancelLoad();

// Playback controls.