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

Unified Diff: third_party/WebKit/Source/modules/mediastream/MediaStream.cpp

Issue 2656343002: Replace [CallWith=ExecutionContext] with [CallWith=ScriptState] (Closed)
Patch Set: Few more Created 3 years, 11 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/mediastream/MediaStream.cpp
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp b/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp
index 461f0ec695cf7e7987bf8796758bdab4cdfac4d5..f5051bf0020157220acc10fe724094714c2003ec 100644
--- a/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp
+++ b/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp
@@ -26,7 +26,9 @@
#include "modules/mediastream/MediaStream.h"
#include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ScriptState.h"
#include "core/dom/ExceptionCode.h"
+#include "core/dom/ExecutionContext.h"
#include "core/dom/TaskRunnerHelper.h"
#include "core/frame/Deprecation.h"
#include "modules/mediastream/MediaStreamRegistry.h"
@@ -274,14 +276,15 @@ MediaStreamTrack* MediaStream::getTrackById(String id) {
return 0;
}
-MediaStream* MediaStream::clone(ExecutionContext* context) {
+MediaStream* MediaStream::clone(ScriptState* scriptState) {
MediaStreamTrackVector tracks;
+ ExecutionContext* context = scriptState->getExecutionContext();
for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin();
iter != m_audioTracks.end(); ++iter)
- tracks.push_back((*iter)->clone(context));
+ tracks.push_back((*iter)->clone(scriptState));
for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin();
iter != m_videoTracks.end(); ++iter)
- tracks.push_back((*iter)->clone(context));
+ tracks.push_back((*iter)->clone(scriptState));
return MediaStream::create(context, tracks);
}

Powered by Google App Engine
This is Rietveld 408576698