| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 | 27 |
| 28 #include "modules/mediastream/MediaStreamTrackSourcesRequest.h" | 28 #include "modules/mediastream/MediaStreamTrackSourcesRequest.h" |
| 29 | 29 |
| 30 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" | 30 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" |
| 31 #include "platform/weborigin/SecurityOrigin.h" | 31 #include "platform/weborigin/SecurityOrigin.h" |
| 32 #include "public/platform/WebSourceInfo.h" | 32 #include "public/platform/WebSourceInfo.h" |
| 33 #include "wtf/PassOwnPtr.h" |
| 33 | 34 |
| 34 namespace WebCore { | 35 namespace WebCore { |
| 35 | 36 |
| 36 PassRefPtr<MediaStreamTrackSourcesRequest> MediaStreamTrackSourcesRequest::creat
e(String origin, PassRefPtr<MediaStreamTrackSourcesCallback> callback) | 37 PassRefPtr<MediaStreamTrackSourcesRequest> MediaStreamTrackSourcesRequest::creat
e(String origin, PassOwnPtr<MediaStreamTrackSourcesCallback> callback) |
| 37 { | 38 { |
| 38 return adoptRef(new MediaStreamTrackSourcesRequest(origin, callback)); | 39 return adoptRef(new MediaStreamTrackSourcesRequest(origin, callback)); |
| 39 } | 40 } |
| 40 | 41 |
| 41 MediaStreamTrackSourcesRequest::MediaStreamTrackSourcesRequest(String origin, Pa
ssRefPtr<MediaStreamTrackSourcesCallback> callback) | 42 MediaStreamTrackSourcesRequest::MediaStreamTrackSourcesRequest(String origin, Pa
ssOwnPtr<MediaStreamTrackSourcesCallback> callback) |
| 42 : m_callback(callback) | 43 : m_callback(callback) |
| 43 , m_scheduledEventTimer(this, &MediaStreamTrackSourcesRequest::scheduledEven
tTimerFired) | 44 , m_scheduledEventTimer(this, &MediaStreamTrackSourcesRequest::scheduledEven
tTimerFired) |
| 44 { | 45 { |
| 45 m_origin = origin; | 46 m_origin = origin; |
| 46 } | 47 } |
| 47 | 48 |
| 48 MediaStreamTrackSourcesRequest::~MediaStreamTrackSourcesRequest() | 49 MediaStreamTrackSourcesRequest::~MediaStreamTrackSourcesRequest() |
| 49 { | 50 { |
| 50 } | 51 } |
| 51 | 52 |
| 52 void MediaStreamTrackSourcesRequest::requestSucceeded(const blink::WebVector<bli
nk::WebSourceInfo>& webSourceInfos) | 53 void MediaStreamTrackSourcesRequest::requestSucceeded(const blink::WebVector<bli
nk::WebSourceInfo>& webSourceInfos) |
| 53 { | 54 { |
| 54 ASSERT(m_callback && !m_scheduledEventTimer.isActive()); | 55 ASSERT(m_callback && !m_scheduledEventTimer.isActive()); |
| 55 | 56 |
| 56 for (size_t i = 0; i < webSourceInfos.size(); ++i) | 57 for (size_t i = 0; i < webSourceInfos.size(); ++i) |
| 57 m_sourceInfos.append(SourceInfo::create(webSourceInfos[i])); | 58 m_sourceInfos.append(SourceInfo::create(webSourceInfos[i])); |
| 58 | 59 |
| 59 m_protect = this; | 60 m_protect = this; |
| 60 m_scheduledEventTimer.startOneShot(0); | 61 m_scheduledEventTimer.startOneShot(0); |
| 61 } | 62 } |
| 62 | 63 |
| 63 void MediaStreamTrackSourcesRequest::scheduledEventTimerFired(Timer<MediaStreamT
rackSourcesRequest>*) | 64 void MediaStreamTrackSourcesRequest::scheduledEventTimerFired(Timer<MediaStreamT
rackSourcesRequest>*) |
| 64 { | 65 { |
| 65 m_callback->handleEvent(m_sourceInfos); | 66 m_callback->handleEvent(m_sourceInfos); |
| 66 m_callback.clear(); | 67 m_callback.clear(); |
| 67 m_protect.release(); | 68 m_protect.release(); |
| 68 } | 69 } |
| 69 | 70 |
| 70 } // namespace WebCore | 71 } // namespace WebCore |
| OLD | NEW |