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

Side by Side Diff: third_party/WebKit/Source/modules/presentation/PresentationConnectionCallbacks.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/presentation/PresentationConnectionCallbacks.h" 5 #include "modules/presentation/PresentationConnectionCallbacks.h"
6 6
7 #include "bindings/core/v8/ScriptPromiseResolver.h" 7 #include "bindings/core/v8/ScriptPromiseResolver.h"
8 #include "modules/presentation/PresentationConnection.h" 8 #include "modules/presentation/PresentationConnection.h"
9 #include "modules/presentation/PresentationError.h" 9 #include "modules/presentation/PresentationError.h"
10 #include "modules/presentation/PresentationRequest.h" 10 #include "modules/presentation/PresentationRequest.h"
11 #include "public/platform/modules/presentation/WebPresentationConnectionClient.h " 11 #include "public/platform/modules/presentation/WebPresentationConnectionClient.h "
12 #include "public/platform/modules/presentation/WebPresentationError.h" 12 #include "public/platform/modules/presentation/WebPresentationError.h"
13 13
14 namespace blink { 14 namespace blink {
15 15
16 PresentationConnectionCallbacks::PresentationConnectionCallbacks(ScriptPromiseRe solver* resolver, PresentationRequest* request) 16 PresentationConnectionCallbacks::PresentationConnectionCallbacks(ScriptPromiseRe solver* resolver, PresentationRequest* request)
17 : m_resolver(resolver) 17 : m_resolver(resolver)
18 , m_request(request) 18 , m_request(request)
19 { 19 {
20 ASSERT(m_resolver); 20 ASSERT(m_resolver);
21 ASSERT(m_request); 21 ASSERT(m_request);
22 } 22 }
23 23
24 void PresentationConnectionCallbacks::onSuccess(WebPassOwnPtr<WebPresentationCon nectionClient> PresentationConnectionClient) 24 void PresentationConnectionCallbacks::onSuccess(WebPassOwnPtr<WebPresentationCon nectionClient> PresentationConnectionClient)
25 { 25 {
26 OwnPtr<WebPresentationConnectionClient> result(PresentationConnectionClient. release()); 26 OwnPtr<WebPresentationConnectionClient> result(PresentationConnectionClient. release());
27 27
28 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped()) 28 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()- >activeDOMObjectsAreStopped())
29 return; 29 return;
30 m_resolver->resolve(PresentationConnection::take(m_resolver.get(), result.re lease(), m_request)); 30 m_resolver->resolve(PresentationConnection::take(m_resolver.get(), result.re lease(), m_request));
31 } 31 }
32 32
33 void PresentationConnectionCallbacks::onError(const WebPresentationError& error) 33 void PresentationConnectionCallbacks::onError(const WebPresentationError& error)
34 { 34 {
35 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped()) 35 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()- >activeDOMObjectsAreStopped())
36 return; 36 return;
37 m_resolver->reject(PresentationError::take(m_resolver.get(), error)); 37 m_resolver->reject(PresentationError::take(m_resolver.get(), error));
38 } 38 }
39 39
40 } // namespace blink 40 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698