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

Unified Diff: webkit/api/src/WebMediaPlayerClientImpl.h

Issue 165176: Merge 21999 - BufferedDataSource to support server without range request supp... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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 | « webkit/api/public/WebMediaPlayer.h ('k') | webkit/api/src/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/api/src/WebMediaPlayerClientImpl.h
===================================================================
--- webkit/api/src/WebMediaPlayerClientImpl.h (revision 22811)
+++ webkit/api/src/WebMediaPlayerClientImpl.h (working copy)
@@ -90,6 +90,8 @@
virtual unsigned bytesLoaded() const;
virtual void setSize(const WebCore::IntSize&);
virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&);
+ virtual bool hasSingleSecurityOrigin() const;
+ virtual WebCore::MediaPlayer::MovieLoadType movieLoadType() const;
private:
WebMediaPlayerClientImpl();
Property changes on: webkit\api\src\WebMediaPlayerClientImpl.h
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk/src/webkit/api/src/WebMediaPlayerClientImpl.h:r21999
Merged /branches/chrome_webkit_merge_branch/deps/third_party/WebKit/WebKit/chromium/src/WebMediaPlayerClientImpl.h:r3734-4214,4606-5108,5177-5263
« no previous file with comments | « webkit/api/public/WebMediaPlayer.h ('k') | webkit/api/src/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698