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

Side by Side Diff: Source/WebCore/platform/graphics/MediaPlayerPrivate.h

Issue 10536097: Merge 119742 - Plumb CORS attribute information from HTMLMediaElement to media players so it can be… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
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:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 #if USE(ACCELERATED_COMPOSITING) 125 #if USE(ACCELERATED_COMPOSITING)
126 // whether accelerated rendering is supported by the media engine for the cu rrent media. 126 // whether accelerated rendering is supported by the media engine for the cu rrent media.
127 virtual bool supportsAcceleratedRendering() const { return false; } 127 virtual bool supportsAcceleratedRendering() const { return false; }
128 // called when the rendering system flips the into or out of accelerated ren dering mode. 128 // called when the rendering system flips the into or out of accelerated ren dering mode.
129 virtual void acceleratedRenderingStateChanged() { } 129 virtual void acceleratedRenderingStateChanged() { }
130 #endif 130 #endif
131 131
132 virtual bool hasSingleSecurityOrigin() const { return false; } 132 virtual bool hasSingleSecurityOrigin() const { return false; }
133 133
134 virtual bool didPassCORSAccessCheck() const { return false; }
135
134 virtual MediaPlayer::MovieLoadType movieLoadType() const { return MediaPlaye r::Unknown; } 136 virtual MediaPlayer::MovieLoadType movieLoadType() const { return MediaPlaye r::Unknown; }
135 137
136 virtual void prepareForRendering() { } 138 virtual void prepareForRendering() { }
137 139
138 // Time value in the movie's time scale. It is only necessary to override th is if the media 140 // Time value in the movie's time scale. It is only necessary to override th is if the media
139 // engine uses rational numbers to represent media time. 141 // engine uses rational numbers to represent media time.
140 virtual float mediaTimeForTimeValue(float timeValue) const { return timeValu e; } 142 virtual float mediaTimeForTimeValue(float timeValue) const { return timeValu e; }
141 143
142 // Overide this if it is safe for HTMLMediaElement to cache movie time and r eport 144 // Overide this if it is safe for HTMLMediaElement to cache movie time and r eport
143 // 'currentTime' as [cached time + elapsed wall time]. Returns the maximum w all time 145 // 'currentTime' as [cached time + elapsed wall time]. Returns the maximum w all time
(...skipping 27 matching lines...) Expand all
171 virtual MediaPlayer::MediaKeyException addKey(const String& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId) { return MediaPlayer::KeySystemNotSupp orted; } 173 virtual MediaPlayer::MediaKeyException addKey(const String& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId) { return MediaPlayer::KeySystemNotSupp orted; }
172 virtual MediaPlayer::MediaKeyException generateKeyRequest(const String& keyS ystem, const unsigned char* initData, unsigned initDataLength) { return MediaPla yer::KeySystemNotSupported; } 174 virtual MediaPlayer::MediaKeyException generateKeyRequest(const String& keyS ystem, const unsigned char* initData, unsigned initDataLength) { return MediaPla yer::KeySystemNotSupported; }
173 virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String& keySys tem, const String& sessionId) { return MediaPlayer::KeySystemNotSupported; } 175 virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String& keySys tem, const String& sessionId) { return MediaPlayer::KeySystemNotSupported; }
174 #endif 176 #endif
175 }; 177 };
176 178
177 } 179 }
178 180
179 #endif 181 #endif
180 #endif 182 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/platform/graphics/MediaPlayer.cpp ('k') | Source/WebKit/chromium/public/WebMediaPlayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698