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

Side by Side Diff: Source/modules/encryptedmedia/MediaEncryptedEvent.cpp

Issue 655603003: Reland: Remove "needkey" event and add its replacement, "encrypted". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "modules/encryptedmedia/MediaKeyNeededEvent.h" 27 #include "modules/encryptedmedia/MediaEncryptedEvent.h"
28
29 #include "wtf/Uint8Array.h"
30 28
31 namespace blink { 29 namespace blink {
32 30
33 MediaKeyNeededEventInit::MediaKeyNeededEventInit() 31 MediaEncryptedEventInit::MediaEncryptedEventInit()
34 { 32 {
35 } 33 }
36 34
37 MediaKeyNeededEvent::MediaKeyNeededEvent() 35 MediaEncryptedEvent::MediaEncryptedEvent()
38 { 36 {
39 } 37 }
40 38
41 MediaKeyNeededEvent::MediaKeyNeededEvent(const AtomicString& type, const MediaKe yNeededEventInit& initializer) 39 MediaEncryptedEvent::MediaEncryptedEvent(const AtomicString& type, const MediaEn cryptedEventInit& initializer)
42 : Event(type, initializer) 40 : Event(type, initializer)
43 , m_contentType(initializer.contentType) 41 , m_initDataType(initializer.initDataType)
44 , m_initData(initializer.initData) 42 , m_initData(initializer.initData)
45 { 43 {
46 } 44 }
47 45
48 MediaKeyNeededEvent::~MediaKeyNeededEvent() 46 MediaEncryptedEvent::~MediaEncryptedEvent()
49 { 47 {
50 } 48 }
51 49
52 const AtomicString& MediaKeyNeededEvent::interfaceName() const 50 const AtomicString& MediaEncryptedEvent::interfaceName() const
53 { 51 {
54 return EventNames::MediaKeyNeededEvent; 52 return EventNames::MediaEncryptedEvent;
55 } 53 }
56 54
57 void MediaKeyNeededEvent::trace(Visitor* visitor) 55 void MediaEncryptedEvent::trace(Visitor* visitor)
58 { 56 {
59 Event::trace(visitor); 57 Event::trace(visitor);
60 } 58 }
61 59
62 } // namespace blink 60 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/MediaEncryptedEvent.h ('k') | Source/modules/encryptedmedia/MediaEncryptedEvent.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698