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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebEncryptedMediaRequest.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 "public/platform/WebEncryptedMediaRequest.h" 5 #include "public/platform/WebEncryptedMediaRequest.h"
6 6
7 #include "platform/EncryptedMediaRequest.h" 7 #include "platform/EncryptedMediaRequest.h"
8 #include "platform/weborigin/SecurityOrigin.h" 8 #include "platform/weborigin/SecurityOrigin.h"
9 #include "public/platform/WebMediaKeySystemConfiguration.h" 9 #include "public/platform/WebMediaKeySystemConfiguration.h"
10 #include "public/platform/WebSecurityOrigin.h" 10 #include "public/platform/WebSecurityOrigin.h"
(...skipping 20 matching lines...) Expand all
31 WebString WebEncryptedMediaRequest::keySystem() const 31 WebString WebEncryptedMediaRequest::keySystem() const
32 { 32 {
33 return m_private->keySystem(); 33 return m_private->keySystem();
34 } 34 }
35 35
36 const WebVector<WebMediaKeySystemConfiguration>& WebEncryptedMediaRequest::suppo rtedConfigurations() const 36 const WebVector<WebMediaKeySystemConfiguration>& WebEncryptedMediaRequest::suppo rtedConfigurations() const
37 { 37 {
38 return m_private->supportedConfigurations(); 38 return m_private->supportedConfigurations();
39 } 39 }
40 40
41 WebSecurityOrigin WebEncryptedMediaRequest::securityOrigin() const 41 WebSecurityOrigin WebEncryptedMediaRequest::getSecurityOrigin() const
42 { 42 {
43 return WebSecurityOrigin(m_private->securityOrigin()); 43 return WebSecurityOrigin(m_private->getSecurityOrigin());
44 } 44 }
45 45
46 void WebEncryptedMediaRequest::requestSucceeded(WebContentDecryptionModuleAccess * access) 46 void WebEncryptedMediaRequest::requestSucceeded(WebContentDecryptionModuleAccess * access)
47 { 47 {
48 m_private->requestSucceeded(access); 48 m_private->requestSucceeded(access);
49 } 49 }
50 50
51 void WebEncryptedMediaRequest::requestNotSupported(const WebString& errorMessage ) 51 void WebEncryptedMediaRequest::requestNotSupported(const WebString& errorMessage )
52 { 52 {
53 m_private->requestNotSupported(errorMessage); 53 m_private->requestNotSupported(errorMessage);
54 } 54 }
55 55
56 void WebEncryptedMediaRequest::assign(const WebEncryptedMediaRequest& other) 56 void WebEncryptedMediaRequest::assign(const WebEncryptedMediaRequest& other)
57 { 57 {
58 m_private = other.m_private; 58 m_private = other.m_private;
59 } 59 }
60 60
61 void WebEncryptedMediaRequest::reset() 61 void WebEncryptedMediaRequest::reset()
62 { 62 {
63 m_private.reset(); 63 m_private.reset();
64 } 64 }
65 65
66 } // namespace blink 66 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698