Chromium Code Reviews| Index: Source/modules/mediastream/MediaStreamTrack.cpp |
| diff --git a/Source/modules/mediastream/MediaStreamTrack.cpp b/Source/modules/mediastream/MediaStreamTrack.cpp |
| index fe6ceafc8095ff6050c78c78de8e9f6de86cda92..034467e0af26986a6b70e6ae96341b54a0276ed5 100644 |
| --- a/Source/modules/mediastream/MediaStreamTrack.cpp |
| +++ b/Source/modules/mediastream/MediaStreamTrack.cpp |
| @@ -30,8 +30,9 @@ |
| #include "core/dom/ScriptExecutionContext.h" |
| #include "core/platform/mediastream/MediaStreamCenter.h" |
| #include "core/platform/mediastream/MediaStreamComponent.h" |
| +#include "modules/mediastream/MediaStreamTrackSourcesCallback.h" |
| +#include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h" |
| #include "public/platform/WebSourceInfo.h" |
| -#include "weborigin/SecurityOrigin.h" |
| namespace WebCore { |
| @@ -118,20 +119,12 @@ String MediaStreamTrack::readyState() const |
| return String(); |
| } |
| -SourceInfoVector MediaStreamTrack::getSourceInfos(ScriptExecutionContext* context, ExceptionCode& ec) |
| +void MediaStreamTrack::getSources(ScriptExecutionContext* context, PassRefPtr<MediaStreamTrackSourcesCallback> callback, ExceptionCode& ec) |
| { |
| - WebKit::WebVector<WebKit::WebSourceInfo> webSourceInfos; |
| - bool ok = MediaStreamCenter::instance().getSourceInfos(context->securityOrigin()->toString(), webSourceInfos); |
| - if (!ok) { |
| + RefPtr<MediaStreamTrackSourcesRequest> request = MediaStreamTrackSourcesRequestImpl::create(context, callback); |
|
abarth-chromium
2013/06/11 23:50:44
MediaStreamTrackSourcesRequestImpl <-- We can prob
Tommy Widenflycht
2013/06/12 12:29:34
Done.
|
| + bool ok = MediaStreamCenter::instance().getMediaStreamTrackSources(request.release()); |
| + if (!ok) |
| ec = NOT_SUPPORTED_ERR; |
| - return SourceInfoVector(); |
| - } |
| - |
| - SourceInfoVector sourceInfos; |
| - for (size_t i = 0; i < webSourceInfos.size(); ++i) |
| - sourceInfos.append(SourceInfo::create(webSourceInfos[i])); |
| - |
| - return sourceInfos; |
| } |
| bool MediaStreamTrack::ended() const |