| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2013 Apple Inc. All rights reserved. | 2  * Copyright (C) 2013 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 11 matching lines...) Expand all  Loading... | 
| 22  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | 22  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | 
| 23  * THE POSSIBILITY OF SUCH DAMAGE. | 23  * THE POSSIBILITY OF SUCH DAMAGE. | 
| 24  */ | 24  */ | 
| 25 | 25 | 
| 26 #include "config.h" | 26 #include "config.h" | 
| 27 #include "modules/encryptedmedia/MediaKeys.h" | 27 #include "modules/encryptedmedia/MediaKeys.h" | 
| 28 | 28 | 
| 29 #include "bindings/v8/ExceptionState.h" | 29 #include "bindings/v8/ExceptionState.h" | 
| 30 #include "core/events/ThreadLocalEventNames.h" | 30 #include "core/events/ThreadLocalEventNames.h" | 
| 31 #include "core/html/HTMLMediaElement.h" | 31 #include "core/html/HTMLMediaElement.h" | 
| 32 #include "core/platform/graphics/ContentDecryptionModule.h" |  | 
| 33 #include "modules/encryptedmedia/MediaKeyMessageEvent.h" | 32 #include "modules/encryptedmedia/MediaKeyMessageEvent.h" | 
| 34 #include "modules/encryptedmedia/MediaKeySession.h" | 33 #include "modules/encryptedmedia/MediaKeySession.h" | 
| 35 #include "platform/UUID.h" | 34 #include "platform/UUID.h" | 
|  | 35 #include "platform/drm/ContentDecryptionModule.h" | 
| 36 #include "wtf/HashSet.h" | 36 #include "wtf/HashSet.h" | 
| 37 | 37 | 
| 38 namespace WebCore { | 38 namespace WebCore { | 
| 39 | 39 | 
| 40 PassRefPtr<MediaKeys> MediaKeys::create(const String& keySystem, ExceptionState&
      es) | 40 PassRefPtr<MediaKeys> MediaKeys::create(const String& keySystem, ExceptionState&
      es) | 
| 41 { | 41 { | 
| 42     // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e
     ncrypted-media.html#dom-media-keys-constructor>: | 42     // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e
     ncrypted-media.html#dom-media-keys-constructor>: | 
| 43     // The MediaKeys(keySystem) constructor must run the following steps: | 43     // The MediaKeys(keySystem) constructor must run the following steps: | 
| 44 | 44 | 
| 45     // 1. If keySystem is null or an empty string, throw an InvalidAccessError e
     xception and abort these steps. | 45     // 1. If keySystem is null or an empty string, throw an InvalidAccessError e
     xception and abort these steps. | 
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 124 | 124 | 
| 125 void MediaKeys::setMediaElement(HTMLMediaElement* element) | 125 void MediaKeys::setMediaElement(HTMLMediaElement* element) | 
| 126 { | 126 { | 
| 127     // FIXME: Cause HTMLMediaElement::setMediaKeys() to throw an exception if m_
     mediaElement is not 0. | 127     // FIXME: Cause HTMLMediaElement::setMediaKeys() to throw an exception if m_
     mediaElement is not 0. | 
| 128     // FIXME: Hook up the CDM to the WebMediaPlayer in Chromium. | 128     // FIXME: Hook up the CDM to the WebMediaPlayer in Chromium. | 
| 129     ASSERT(!m_mediaElement); | 129     ASSERT(!m_mediaElement); | 
| 130     m_mediaElement = element; | 130     m_mediaElement = element; | 
| 131 } | 131 } | 
| 132 | 132 | 
| 133 } | 133 } | 
| OLD | NEW | 
|---|