Changeset 142819 in webkit
- Timestamp:
- Feb 13, 2013 4:02:12 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r142816 r142819 1 2013-02-13 Jer Noble <jer.noble@apple.com> 2 3 EME: MediaPlayer::keyNeede() should return a bool indicating whether an event listener was triggered. 4 https://bugs.webkit.org/show_bug.cgi?id=109701 5 6 Reviewed by Eric Carlson. 7 8 Clients of MediaPlayer may need to do cleanup if calling keyNeeded() 9 results in no event listener being triggered. Return a bool (like the 10 v1 equivalent keyNeeded method) to indicate this. 11 12 * html/HTMLMediaElement.cpp: 13 (WebCore::HTMLMediaElement::mediaPlayerKeyNeeded): 14 * html/HTMLMediaElement.h: 15 * platform/graphics/MediaPlayer.cpp: 16 (WebCore::MediaPlayer::keyNeeded): 17 * platform/graphics/MediaPlayer.h: 18 (WebCore::MediaPlayerClient::mediaPlayerKeyNeeded): 19 1 20 2013-02-13 Abhishek Arya <inferno@chromium.org> 2 21 -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r142810 r142819 1974 1974 1975 1975 #if ENABLE(ENCRYPTED_MEDIA_V2) 1976 void HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array* initData) 1977 { 1976 bool HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array* initData) 1977 { 1978 if (!hasEventListeners("webkitneedkey")) { 1979 m_error = MediaError::create(MediaError::MEDIA_ERR_ENCRYPTED); 1980 scheduleEvent(eventNames().errorEvent); 1981 return false; 1982 } 1983 1978 1984 MediaKeyNeededEventInit initializer; 1979 1985 initializer.initData = initData; … … 1984 1990 event->setTarget(this); 1985 1991 m_asyncEventQueue->enqueueEvent(event.release()); 1992 1993 return true; 1986 1994 } 1987 1995 -
trunk/Source/WebCore/html/HTMLMediaElement.h
r142809 r142819 456 456 457 457 #if ENABLE(ENCRYPTED_MEDIA_V2) 458 virtual voidmediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*);458 virtual bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*); 459 459 #endif 460 460 -
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp
r142327 r142819 1083 1083 1084 1084 #if ENABLE(ENCRYPTED_MEDIA_V2) 1085 void MediaPlayer::keyNeeded(Uint8Array* initData) 1086 { 1087 if (m_mediaPlayerClient) 1088 m_mediaPlayerClient->mediaPlayerKeyNeeded(this, initData); 1085 bool MediaPlayer::keyNeeded(Uint8Array* initData) 1086 { 1087 if (m_mediaPlayerClient) 1088 return m_mediaPlayerClient->mediaPlayerKeyNeeded(this, initData); 1089 return false; 1089 1090 } 1090 1091 #endif -
trunk/Source/WebCore/platform/graphics/MediaPlayer.h
r142327 r142819 195 195 196 196 #if ENABLE(ENCRYPTED_MEDIA_V2) 197 virtual void mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*) {}197 virtual bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*) { return false; } 198 198 #endif 199 199 … … 436 436 437 437 #if ENABLE(ENCRYPTED_MEDIA_V2) 438 voidkeyNeeded(Uint8Array* initData);438 bool keyNeeded(Uint8Array* initData); 439 439 #endif 440 440
Note: See TracChangeset
for help on using the changeset viewer.