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

Side by Side Diff: Source/web/MediaKeysClientImpl.cpp

Issue 338713002: Remove duplicated provideMediaKeysTo() in MediaKeysClient.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
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 "config.h" 5 #include "config.h"
6 #include "web/MediaKeysClientImpl.h" 6 #include "web/MediaKeysClientImpl.h"
7 7
8 #include "core/dom/Document.h" 8 #include "core/dom/Document.h"
9 #include "core/dom/ExecutionContext.h" 9 #include "core/dom/ExecutionContext.h"
10 #include "public/platform/WebContentDecryptionModule.h" 10 #include "public/platform/WebContentDecryptionModule.h"
11 #include "public/web/WebFrameClient.h" 11 #include "public/web/WebFrameClient.h"
12 #include "web/WebLocalFrameImpl.h" 12 #include "web/WebLocalFrameImpl.h"
13 13
14 using namespace WebCore; 14 using namespace WebCore;
15 15
16 namespace blink { 16 namespace blink {
17 17
18 MediaKeysClientImpl::MediaKeysClientImpl() 18 MediaKeysClientImpl::MediaKeysClientImpl()
19 { 19 {
20 } 20 }
21 21
22 PassOwnPtr<MediaKeysClient> MediaKeysClientImpl::create()
23 {
24 return adoptPtr(new MediaKeysClientImpl());
25 }
26
22 PassOwnPtr<WebContentDecryptionModule> MediaKeysClientImpl::createContentDecrypt ionModule(WebCore::ExecutionContext* executionContext, const String& keySystem) 27 PassOwnPtr<WebContentDecryptionModule> MediaKeysClientImpl::createContentDecrypt ionModule(WebCore::ExecutionContext* executionContext, const String& keySystem)
23 { 28 {
24 Document* document = toDocument(executionContext); 29 Document* document = toDocument(executionContext);
25 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame() ); 30 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame() );
26 WebSecurityOrigin securityOrigin(executionContext->securityOrigin()); 31 WebSecurityOrigin securityOrigin(executionContext->securityOrigin());
27 return adoptPtr(webFrame->client()->createContentDecryptionModule(webFrame, securityOrigin, keySystem)); 32 return adoptPtr(webFrame->client()->createContentDecryptionModule(webFrame, securityOrigin, keySystem));
28 } 33 }
29 34
30 } // namespace blink 35 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698