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

Side by Side Diff: third_party/WebKit/Source/modules/encryptedmedia/ContentDecryptionModuleResultPromise.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 "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h" 5 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h"
6 6
7 #include "bindings/core/v8/ScriptPromise.h" 7 #include "bindings/core/v8/ScriptPromise.h"
8 #include "bindings/core/v8/ScriptState.h" 8 #include "bindings/core/v8/ScriptState.h"
9 #include "core/dom/DOMException.h" 9 #include "core/dom/DOMException.h"
10 #include "public/platform/WebString.h" 10 #include "public/platform/WebString.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 { 82 {
83 return m_resolver->promise(); 83 return m_resolver->promise();
84 } 84 }
85 85
86 void ContentDecryptionModuleResultPromise::reject(ExceptionCode code, const Stri ng& errorMessage) 86 void ContentDecryptionModuleResultPromise::reject(ExceptionCode code, const Stri ng& errorMessage)
87 { 87 {
88 m_resolver->reject(DOMException::create(code, errorMessage)); 88 m_resolver->reject(DOMException::create(code, errorMessage));
89 m_resolver.clear(); 89 m_resolver.clear();
90 } 90 }
91 91
92 ExecutionContext* ContentDecryptionModuleResultPromise::executionContext() const 92 ExecutionContext* ContentDecryptionModuleResultPromise::getExecutionContext() co nst
93 { 93 {
94 return m_resolver->executionContext(); 94 return m_resolver->getExecutionContext();
95 } 95 }
96 96
97 DEFINE_TRACE(ContentDecryptionModuleResultPromise) 97 DEFINE_TRACE(ContentDecryptionModuleResultPromise)
98 { 98 {
99 visitor->trace(m_resolver); 99 visitor->trace(m_resolver);
100 ContentDecryptionModuleResult::trace(visitor); 100 ContentDecryptionModuleResult::trace(visitor);
101 } 101 }
102 102
103 } // namespace blink 103 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698