| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/blink/webcontentdecryptionmodule_impl.h" | 5 #include "media/blink/webcontentdecryptionmodule_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 std::vector<uint8_t>(server_certificate, | 98 std::vector<uint8_t>(server_certificate, |
| 99 server_certificate + server_certificate_length), | 99 server_certificate + server_certificate_length), |
| 100 std::unique_ptr<SimpleCdmPromise>( | 100 std::unique_ptr<SimpleCdmPromise>( |
| 101 new CdmResultPromise<>(result, std::string()))); | 101 new CdmResultPromise<>(result, std::string()))); |
| 102 } | 102 } |
| 103 | 103 |
| 104 CdmContext* WebContentDecryptionModuleImpl::GetCdmContext() { | 104 CdmContext* WebContentDecryptionModuleImpl::GetCdmContext() { |
| 105 return adapter_->GetCdmContext(); | 105 return adapter_->GetCdmContext(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 CdmSessionAdapter* WebContentDecryptionModuleImpl::GetCdmAdapterReference() { |
| 109 return adapter_.get(); |
| 110 } |
| 111 |
| 108 } // namespace media | 112 } // namespace media |
| OLD | NEW |