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

Unified Diff: third_party/WebKit/Source/modules/presentation/PresentationConnection.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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp
diff --git a/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp b/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp
index 716c87263fc93f717ffe3ee5c836f563880792c5..9c1ee108543ccd58d1d60846d85f114b00c67342 100644
--- a/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp
+++ b/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp
@@ -94,7 +94,7 @@ public:
: m_PresentationConnection(PresentationConnection)
, m_loader(FileReaderLoader::ReadAsArrayBuffer, this)
{
- m_loader.start(m_PresentationConnection->executionContext(), blobDataHandle);
+ m_loader.start(m_PresentationConnection->getExecutionContext(), blobDataHandle);
}
~BlobLoader() override { }
@@ -145,9 +145,9 @@ PresentationConnection* PresentationConnection::take(ScriptPromiseResolver* reso
ASSERT(resolver);
ASSERT(client);
ASSERT(request);
- ASSERT(resolver->executionContext()->isDocument());
+ ASSERT(resolver->getExecutionContext()->isDocument());
- Document* document = toDocument(resolver->executionContext());
+ Document* document = toDocument(resolver->getExecutionContext());
if (!document->frame())
return nullptr;
@@ -176,7 +176,7 @@ const AtomicString& PresentationConnection::interfaceName() const
return EventTargetNames::PresentationConnection;
}
-ExecutionContext* PresentationConnection::executionContext() const
+ExecutionContext* PresentationConnection::getExecutionContext() const
{
if (!frame())
return nullptr;
@@ -186,15 +186,15 @@ ExecutionContext* PresentationConnection::executionContext() const
bool PresentationConnection::addEventListenerInternal(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener> listener, const EventListenerOptions& options)
{
if (eventType == EventTypeNames::statechange)
- Deprecation::countDeprecation(executionContext(), UseCounter::PresentationConnectionStateChangeEventListener);
+ Deprecation::countDeprecation(getExecutionContext(), UseCounter::PresentationConnectionStateChangeEventListener);
else if (eventType == EventTypeNames::connect)
- UseCounter::count(executionContext(), UseCounter::PresentationConnectionConnectEventListener);
+ UseCounter::count(getExecutionContext(), UseCounter::PresentationConnectionConnectEventListener);
else if (eventType == EventTypeNames::close)
- UseCounter::count(executionContext(), UseCounter::PresentationConnectionCloseEventListener);
+ UseCounter::count(getExecutionContext(), UseCounter::PresentationConnectionCloseEventListener);
else if (eventType == EventTypeNames::terminate)
- UseCounter::count(executionContext(), UseCounter::PresentationConnectionTerminateEventListener);
+ UseCounter::count(getExecutionContext(), UseCounter::PresentationConnectionTerminateEventListener);
else if (eventType == EventTypeNames::message)
- UseCounter::count(executionContext(), UseCounter::PresentationConnectionMessageEventListener);
+ UseCounter::count(getExecutionContext(), UseCounter::PresentationConnectionMessageEventListener);
return EventTarget::addEventListenerInternal(eventType, listener, options);
}
@@ -258,12 +258,12 @@ bool PresentationConnection::canSendMessage(ExceptionState& exceptionState)
}
// The connection can send a message if there is a client available.
- return !!presentationClient(executionContext());
+ return !!presentationClient(getExecutionContext());
}
void PresentationConnection::handleMessageQueue()
{
- WebPresentationClient* client = presentationClient(executionContext());
+ WebPresentationClient* client = presentationClient(getExecutionContext());
if (!client)
return;
@@ -344,7 +344,7 @@ void PresentationConnection::close()
{
if (m_state != WebPresentationConnectionState::Connected)
return;
- WebPresentationClient* client = presentationClient(executionContext());
+ WebPresentationClient* client = presentationClient(getExecutionContext());
if (client)
client->closeSession(m_url, m_id);
@@ -355,7 +355,7 @@ void PresentationConnection::terminate()
{
if (m_state != WebPresentationConnectionState::Connected)
return;
- WebPresentationClient* client = presentationClient(executionContext());
+ WebPresentationClient* client = presentationClient(getExecutionContext());
if (client)
client->terminateSession(m_url, m_id);
@@ -402,7 +402,7 @@ void PresentationConnection::didFinishLoadingBlob(PassRefPtr<DOMArrayBuffer> buf
ASSERT(!m_messages.isEmpty() && m_messages.first()->type == MessageTypeBlob);
ASSERT(buffer && buffer->buffer());
// Send the loaded blob immediately here and continue processing the queue.
- WebPresentationClient* client = presentationClient(executionContext());
+ WebPresentationClient* client = presentationClient(getExecutionContext());
if (client)
client->sendBlobData(m_url, m_id, static_cast<const uint8_t*>(buffer->data()), buffer->byteLength());

Powered by Google App Engine
This is Rietveld 408576698