webkit/media/crypto/proxy_decryptor.cc - Issue 15937016: Update refernces to Blink's Platform API (webkit)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: webkit/media/crypto/proxy_decryptor.cc

Issue 15937016: Update refernces to Blink's Platform API (webkit) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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 | Annotate | Revision Log

« no previous file with comments | « webkit/media/crypto/key_systems_unittest.cc ('k') | webkit/media/test_response_generator.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "webkit/media/crypto/proxy_decryptor.h"	5 #include "webkit/media/crypto/proxy_decryptor.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/callback_helpers.h"	8 #include "base/callback_helpers.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "media/crypto/aes_decryptor.h"	10 #include "media/crypto/aes_decryptor.h"

11 #include "webkit/media/crypto/key_systems.h"	11 #include "webkit/media/crypto/key_systems.h"

12	12

13 #if defined(ENABLE_PEPPER_CDMS)	13 #if defined(ENABLE_PEPPER_CDMS)

14 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"	14 #include "third_party/WebKit/public/platform/WebString.h"

15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"	15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"	16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"

17 #include "webkit/media/crypto/ppapi_decryptor.h"	17 #include "webkit/media/crypto/ppapi_decryptor.h"

18 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"	18 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"

19 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"	19 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"

20 #endif // defined(ENABLE_PEPPER_CDMS)	20 #endif // defined(ENABLE_PEPPER_CDMS)

21	21

22 namespace webkit_media {	22 namespace webkit_media {

23	23

24 #if defined(ENABLE_PEPPER_CDMS)	24 #if defined(ENABLE_PEPPER_CDMS)

(...skipping 200 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
225 void ProxyDecryptor::NeedKey(const std::string& key_system,	225 void ProxyDecryptor::NeedKey(const std::string& key_system,

226 const std::string& session_id,	226 const std::string& session_id,

227 const std::string& type,	227 const std::string& type,

228 scoped_ptr<uint8[]> init_data,	228 scoped_ptr<uint8[]> init_data,

229 int init_data_size) {	229 int init_data_size) {

230 need_key_cb_.Run(key_system, session_id, type,	230 need_key_cb_.Run(key_system, session_id, type,

231 init_data.Pass(), init_data_size);	231 init_data.Pass(), init_data_size);

232 }	232 }

233	233

234 } // namespace webkit_media	234 } // namespace webkit_media

OLD	NEW