| OLD | NEW |
| 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 "config.h" | 5 #include "config.h" |
| 6 #include "modules/encryptedmedia/MediaKeysController.h" | 6 #include "modules/encryptedmedia/MediaKeysController.h" |
| 7 | 7 |
| 8 #include "modules/encryptedmedia/MediaKeysClient.h" | 8 #include "modules/encryptedmedia/MediaKeysClient.h" |
| 9 #include "public/platform/WebContentDecryptionModule.h" | 9 #include "public/platform/WebContentDecryptionModule.h" |
| 10 | 10 |
| 11 namespace WebCore { | 11 namespace WebCore { |
| 12 | 12 |
| 13 const char* MediaKeysController::supplementName() | 13 const char* MediaKeysController::supplementName() |
| 14 { | 14 { |
| 15 return "MediaKeysController"; | 15 return "MediaKeysController"; |
| 16 } | 16 } |
| 17 | 17 |
| 18 MediaKeysController::MediaKeysController(MediaKeysClient* client) | 18 MediaKeysController::MediaKeysController(PassOwnPtr<MediaKeysClient> client) |
| 19 : m_client(client) | 19 : m_client(client) |
| 20 { | 20 { |
| 21 } | 21 } |
| 22 | 22 |
| 23 MediaKeysController::~MediaKeysController() |
| 24 { |
| 25 } |
| 26 |
| 23 PassOwnPtr<blink::WebContentDecryptionModule> MediaKeysController::createContent
DecryptionModule(ExecutionContext* context, const String& keySystem) | 27 PassOwnPtr<blink::WebContentDecryptionModule> MediaKeysController::createContent
DecryptionModule(ExecutionContext* context, const String& keySystem) |
| 24 { | 28 { |
| 25 return m_client->createContentDecryptionModule(context, keySystem); | 29 return m_client->createContentDecryptionModule(context, keySystem); |
| 26 } | 30 } |
| 27 | 31 |
| 28 | 32 |
| 29 void MediaKeysController::provideMediaKeysTo(Page& page, MediaKeysClient* client
) | 33 void MediaKeysController::provideMediaKeysTo(Page& page, PassOwnPtr<MediaKeysCli
ent> client) |
| 30 { | 34 { |
| 31 MediaKeysController::provideTo(page, supplementName(), adoptPtrWillBeNoop(ne
w MediaKeysController(client))); | 35 MediaKeysController::provideTo(page, supplementName(), adoptPtrWillBeNoop(ne
w MediaKeysController(client))); |
| 32 } | 36 } |
| 33 | 37 |
| 34 } // namespace WebCore | 38 } // namespace WebCore |
| 35 | 39 |
| OLD | NEW |