third_party/WebKit/Source/modules/webmidi/MIDIPort.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/webmidi/MIDIPort.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

« no previous file with comments | « third_party/WebKit/Source/modules/webmidi/MIDIPort.h ('k') | third_party/WebKit/Source/modules/websockets/DOMWebSocket.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webmidi/MIDIPort.cpp

diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIPort.cpp b/third_party/WebKit/Source/modules/webmidi/MIDIPort.cpp

index 80d79cbc540cf563491ee45b0abe9398cb4015c5..b90614a25734ef63c61cb18627bfa301f47f98f1 100644

--- a/third_party/WebKit/Source/modules/webmidi/MIDIPort.cpp

+++ b/third_party/WebKit/Source/modules/webmidi/MIDIPort.cpp

@@ -40,7 +40,7 @@ namespace blink {

using PortState = MIDIAccessor::MIDIPortState;

MIDIPort::MIDIPort(MIDIAccess* access, const String& id, const String& manufacturer, const String& name, TypeCode type, const String& version, PortState state)

- : ActiveDOMObject(access->executionContext())

+ : ActiveDOMObject(access->getExecutionContext())

, m_id(id)

, m_manufacturer(manufacturer)

, m_name(name)

@@ -141,9 +141,9 @@ void MIDIPort::setState(PortState state)

}

-ExecutionContext* MIDIPort::executionContext() const

+ExecutionContext* MIDIPort::getExecutionContext() const

{

- return m_access->executionContext();

+ return m_access->getExecutionContext();

}

bool MIDIPort::hasPendingActivity() const