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

Unified Diff: third_party/WebKit/Source/modules/webmidi/MIDIAccess.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/webmidi/MIDIAccess.cpp
diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp b/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp
index 47b3086b595e14a89c3b9c21239767376e2d6e76..ec8f2c89ab40220e82e2b62bf4b819583ccef746 100644
--- a/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp
+++ b/third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp
@@ -81,7 +81,7 @@ void MIDIAccess::setOnstatechange(PassRefPtrWillBeRawPtr<EventListener> listener
bool MIDIAccess::hasPendingActivity() const
{
- return m_hasPendingActivity && !executionContext()->activeDOMObjectsAreStopped();
+ return m_hasPendingActivity && !getExecutionContext()->activeDOMObjectsAreStopped();
}
MIDIInputMap* MIDIAccess::inputs() const
@@ -164,7 +164,7 @@ void MIDIAccess::didReceiveMIDIData(unsigned portIndex, const unsigned char* dat
// Convert from time in seconds which is based on the time coordinate system of monotonicallyIncreasingTime()
// into time in milliseconds (a DOMHighResTimeStamp) according to the same time coordinate system as performance.now().
// This is how timestamps are defined in the Web MIDI spec.
- Document* document = toDocument(executionContext());
+ Document* document = toDocument(getExecutionContext());
ASSERT(document);
double timeStampInMilliseconds = 1000 * document->loader()->timing().monotonicTimeToZeroBasedDocumentTime(timeStamp);
@@ -185,7 +185,7 @@ void MIDIAccess::sendMIDIData(unsigned portIndex, const unsigned char* data, siz
// We need to translate it exactly to 0 seconds.
timeStamp = 0;
} else {
- Document* document = toDocument(executionContext());
+ Document* document = toDocument(getExecutionContext());
ASSERT(document);
double documentStartTime = document->loader()->timing().referenceMonotonicTime();
timeStamp = documentStartTime + 0.001 * timeStampInMilliseconds;

Powered by Google App Engine
This is Rietveld 408576698