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

Side by Side Diff: media/cdm/default_cdm_factory.cc

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 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
« no previous file with comments | « media/cdm/aes_decryptor_unittest.cc ('k') | media/cdm/player_tracker_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "media/cdm/default_cdm_factory.h" 5 #include "media/cdm/default_cdm_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 25 matching lines...) Expand all
36 FROM_HERE, base::Bind(cdm_created_cb, nullptr, "Invalid origin.")); 36 FROM_HERE, base::Bind(cdm_created_cb, nullptr, "Invalid origin."));
37 return; 37 return;
38 } 38 }
39 if (!CanUseAesDecryptor(key_system)) { 39 if (!CanUseAesDecryptor(key_system)) {
40 base::ThreadTaskRunnerHandle::Get()->PostTask( 40 base::ThreadTaskRunnerHandle::Get()->PostTask(
41 FROM_HERE, 41 FROM_HERE,
42 base::Bind(cdm_created_cb, nullptr, "Unsupported key system.")); 42 base::Bind(cdm_created_cb, nullptr, "Unsupported key system."));
43 return; 43 return;
44 } 44 }
45 45
46 scoped_ptr<MediaKeys> cdm( 46 scoped_refptr<MediaKeys> cdm(
47 new AesDecryptor(security_origin, session_message_cb, session_closed_cb, 47 new AesDecryptor(security_origin, session_message_cb, session_closed_cb,
48 session_keys_change_cb)); 48 session_keys_change_cb));
49 base::ThreadTaskRunnerHandle::Get()->PostTask( 49 base::ThreadTaskRunnerHandle::Get()->PostTask(
50 FROM_HERE, base::Bind(cdm_created_cb, base::Passed(&cdm), "")); 50 FROM_HERE, base::Bind(cdm_created_cb, cdm, ""));
51 } 51 }
52 52
53 } // namespace media 53 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/aes_decryptor_unittest.cc ('k') | media/cdm/player_tracker_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698