content/common/media/media_player_messages_android.h - Issue 181593004: Encrypted Media: Destroy CDM in ProxyMediaKeys' dtor.

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: content/common/media/media_player_messages_android.h

Issue 181593004: Encrypted Media: Destroy CDM in ProxyMediaKeys' dtor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comments addressed Created 6 years, 10 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

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 // IPC messages for android media player.	5 // IPC messages for android media player.

6 // Multiply-included message file, hence no include guard.	6 // Multiply-included message file, hence no include guard.

7	7

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

(...skipping 288 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
299	299

300 IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_UpdateSession,	300 IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_UpdateSession,

301 int /* media_keys_id */,	301 int /* media_keys_id */,

302 uint32_t /* session_id */,	302 uint32_t /* session_id */,

303 std::vector<uint8> /* response */)	303 std::vector<uint8> /* response */)

304	304

305 IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_ReleaseSession,	305 IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_ReleaseSession,

306 int /* media_keys_id */,	306 int /* media_keys_id */,

307 uint32_t /* session_id */)	307 uint32_t /* session_id */)

308	308

309 IPC_MESSAGE_ROUTED1(MediaKeysHostMsg_CancelAllPendingSessionCreations,	309 IPC_MESSAGE_ROUTED1(MediaKeysHostMsg_DestroyCdm,

310 int /* media_keys_id */)	310 int /* media_keys_id */)

311	311

312 IPC_MESSAGE_ROUTED3(MediaKeysMsg_SessionCreated,	312 IPC_MESSAGE_ROUTED3(MediaKeysMsg_SessionCreated,

313 int /* media_keys_id */,	313 int /* media_keys_id */,

314 uint32_t /* session_id */,	314 uint32_t /* session_id */,

315 std::string /* web_session_id */)	315 std::string /* web_session_id */)

316	316

317 IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionMessage,	317 IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionMessage,

318 int /* media_keys_id */,	318 int /* media_keys_id */,

319 uint32_t /* session_id */,	319 uint32_t /* session_id */,

320 std::vector<uint8> /* message */,	320 std::vector<uint8> /* message */,

321 GURL /* destination_url */)	321 GURL /* destination_url */)

322	322

323 IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionReady,	323 IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionReady,

324 int /* media_keys_id */,	324 int /* media_keys_id */,

325 uint32_t /* session_id */)	325 uint32_t /* session_id */)

326	326

327 IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed,	327 IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed,

328 int /* media_keys_id */,	328 int /* media_keys_id */,

329 uint32_t /* session_id */)	329 uint32_t /* session_id */)

330	330

331 IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError,	331 IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError,

332 int /* media_keys_id */,	332 int /* media_keys_id */,

333 uint32_t /* session_id */,	333 uint32_t /* session_id */,

334 media::MediaKeys::KeyError /* error_code */,	334 media::MediaKeys::KeyError /* error_code */,

335 int /* system_code */)	335 int /* system_code */)

OLD	NEW