| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/media_stream.h" | 5 #include "content/renderer/media/media_stream.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "third_party/WebKit/public/platform/WebString.h" | 10 #include "third_party/WebKit/public/platform/WebString.h" |
| 11 | 11 |
| 12 namespace content { | 12 namespace content { |
| 13 | 13 |
| 14 // static | 14 // static |
| 15 MediaStream* MediaStream::GetMediaStream( | 15 MediaStream* MediaStream::GetMediaStream( |
| 16 const blink::WebMediaStream& stream) { | 16 const blink::WebMediaStream& stream) { |
| 17 return static_cast<MediaStream*>(stream.extraData()); | 17 return static_cast<MediaStream*>(stream.getExtraData()); |
| 18 } | 18 } |
| 19 | 19 |
| 20 MediaStream::MediaStream() { | 20 MediaStream::MediaStream() { |
| 21 } | 21 } |
| 22 | 22 |
| 23 MediaStream::~MediaStream() { | 23 MediaStream::~MediaStream() { |
| 24 DCHECK(observers_.empty()); | 24 DCHECK(observers_.empty()); |
| 25 } | 25 } |
| 26 | 26 |
| 27 void MediaStream::AddObserver(MediaStreamObserver* observer) { | 27 void MediaStream::AddObserver(MediaStreamObserver* observer) { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 51 bool MediaStream::RemoveTrack(const blink::WebMediaStreamTrack& track) { | 51 bool MediaStream::RemoveTrack(const blink::WebMediaStreamTrack& track) { |
| 52 DCHECK(thread_checker_.CalledOnValidThread()); | 52 DCHECK(thread_checker_.CalledOnValidThread()); |
| 53 for (std::vector<MediaStreamObserver*>::iterator it = observers_.begin(); | 53 for (std::vector<MediaStreamObserver*>::iterator it = observers_.begin(); |
| 54 it != observers_.end(); ++it) { | 54 it != observers_.end(); ++it) { |
| 55 (*it)->TrackRemoved(track); | 55 (*it)->TrackRemoved(track); |
| 56 } | 56 } |
| 57 return true; | 57 return true; |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace content | 60 } // namespace content |
| OLD | NEW |