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

Unified Diff: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

Issue 1362973004: Rename FROM_HERE to BLINK_FROM_HERE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 5 years, 2 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/encryptedmedia/MediaKeySession.cpp
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
index 6111349b6b7ff973b539732352fa66437b5cd1d2..1a41d80a393e63a7ad5781cc2092424115d7dc9e 100644
--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
@@ -447,7 +447,7 @@ ScriptPromise MediaKeySession::generateRequest(ScriptState* scriptState, const S
// actionTimerFired())
m_pendingActions.append(PendingAction::CreatePendingGenerateRequest(result, initDataType, initDataBuffer.release()));
ASSERT(!m_actionTimer.isActive());
- m_actionTimer.startOneShot(0, FROM_HERE);
+ m_actionTimer.startOneShot(0, BLINK_FROM_HERE);
// 10. Return promise.
return promise;
@@ -501,7 +501,7 @@ ScriptPromise MediaKeySession::load(ScriptState* scriptState, const String& sess
// actionTimerFired())
m_pendingActions.append(PendingAction::CreatePendingLoadRequest(result, sessionId));
ASSERT(!m_actionTimer.isActive());
- m_actionTimer.startOneShot(0, FROM_HERE);
+ m_actionTimer.startOneShot(0, BLINK_FROM_HERE);
// 9. Return promise.
return promise;
@@ -539,7 +539,7 @@ ScriptPromise MediaKeySession::update(ScriptState* scriptState, const DOMArrayPi
// actionTimerFired())
m_pendingActions.append(PendingAction::CreatePendingUpdate(result, responseCopy.release()));
if (!m_actionTimer.isActive())
- m_actionTimer.startOneShot(0, FROM_HERE);
+ m_actionTimer.startOneShot(0, BLINK_FROM_HERE);
// 6. Return promise.
return promise;
@@ -572,7 +572,7 @@ ScriptPromise MediaKeySession::close(ScriptState* scriptState)
// actionTimerFired()).
m_pendingActions.append(PendingAction::CreatePendingClose(result));
if (!m_actionTimer.isActive())
- m_actionTimer.startOneShot(0, FROM_HERE);
+ m_actionTimer.startOneShot(0, BLINK_FROM_HERE);
// 5. Return promise.
return promise;
@@ -615,7 +615,7 @@ ScriptPromise MediaKeySession::remove(ScriptState* scriptState)
// actionTimerFired()).
m_pendingActions.append(PendingAction::CreatePendingRemove(result));
if (!m_actionTimer.isActive())
- m_actionTimer.startOneShot(0, FROM_HERE);
+ m_actionTimer.startOneShot(0, BLINK_FROM_HERE);
// 6. Return promise.
return promise;

Powered by Google App Engine
This is Rietveld 408576698