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

Side by Side Diff: Source/platform/graphics/media/ContentDecryptionModuleSession.cpp

Issue 48273013: Move MediaPlayer, IntSizeHash to platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: move MediaPlayer and friends to platform/graphics/media Created 7 years, 1 month 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/platform/graphics/ContentDecryptionModuleSession.h" 32 #include "platform/graphics/media/ContentDecryptionModuleSession.h"
33 33
34 #include "public/platform/Platform.h" 34 #include "public/platform/Platform.h"
35 #include "public/platform/WebContentDecryptionModule.h" 35 #include "public/platform/WebContentDecryptionModule.h"
36 #include "public/platform/WebURL.h" 36 #include "public/platform/WebURL.h"
37 #include "weborigin/KURL.h" 37 #include "weborigin/KURL.h"
38 #include "wtf/Uint8Array.h" 38 #include "wtf/Uint8Array.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 ContentDecryptionModuleSession::ContentDecryptionModuleSession(WebKit::WebConten tDecryptionModule* contentDecryptionModule, ContentDecryptionModuleSessionClient * client) 42 ContentDecryptionModuleSession::ContentDecryptionModuleSession(WebKit::WebConten tDecryptionModule* contentDecryptionModule, ContentDecryptionModuleSessionClient * client)
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 { 79 {
80 m_client->keyError(static_cast<ContentDecryptionModuleSessionClient::MediaKe yErrorCode>(errorCode), systemCode); 80 m_client->keyError(static_cast<ContentDecryptionModuleSessionClient::MediaKe yErrorCode>(errorCode), systemCode);
81 } 81 }
82 82
83 void ContentDecryptionModuleSession::keyMessage(const unsigned char* message, si ze_t messageLength, const WebKit::WebURL& destinationURL) 83 void ContentDecryptionModuleSession::keyMessage(const unsigned char* message, si ze_t messageLength, const WebKit::WebURL& destinationURL)
84 { 84 {
85 m_client->keyMessage(message, messageLength, destinationURL); 85 m_client->keyMessage(message, messageLength, destinationURL);
86 } 86 }
87 87
88 } // namespace WebCore 88 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698