| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011, 2012 Ericsson AB. All rights reserved. | 3 * Copyright (C) 2011, 2012 Ericsson AB. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "modules/mediastream/MediaStream.h" | 27 #include "modules/mediastream/MediaStream.h" |
| 28 | 28 |
| 29 #include "bindings/v8/ExceptionState.h" | 29 #include "bindings/v8/ExceptionState.h" |
| 30 #include "core/events/Event.h" | 30 #include "core/events/Event.h" |
| 31 #include "core/dom/ExceptionCode.h" | 31 #include "core/dom/ExceptionCode.h" |
| 32 #include "core/platform/mediastream/MediaStreamCenter.h" | 32 #include "core/platform/mediastream/MediaStreamCenter.h" |
| 33 #include "core/platform/mediastream/MediaStreamSource.h" | |
| 34 #include "modules/mediastream/MediaStreamRegistry.h" | 33 #include "modules/mediastream/MediaStreamRegistry.h" |
| 35 #include "modules/mediastream/MediaStreamTrackEvent.h" | 34 #include "modules/mediastream/MediaStreamTrackEvent.h" |
| 35 #include "platform/mediastream/MediaStreamSource.h" |
| 36 | 36 |
| 37 namespace WebCore { | 37 namespace WebCore { |
| 38 | 38 |
| 39 static bool containsSource(MediaStreamSourceVector& sourceVector, MediaStreamSou
rce* source) | 39 static bool containsSource(MediaStreamSourceVector& sourceVector, MediaStreamSou
rce* source) |
| 40 { | 40 { |
| 41 for (size_t i = 0; i < sourceVector.size(); ++i) { | 41 for (size_t i = 0; i < sourceVector.size(); ++i) { |
| 42 if (source->id() == sourceVector[i]->id()) | 42 if (source->id() == sourceVector[i]->id()) |
| 43 return true; | 43 return true; |
| 44 } | 44 } |
| 45 return false; | 45 return false; |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 | 345 |
| 346 events.clear(); | 346 events.clear(); |
| 347 } | 347 } |
| 348 | 348 |
| 349 URLRegistry& MediaStream::registry() const | 349 URLRegistry& MediaStream::registry() const |
| 350 { | 350 { |
| 351 return MediaStreamRegistry::registry(); | 351 return MediaStreamRegistry::registry(); |
| 352 } | 352 } |
| 353 | 353 |
| 354 } // namespace WebCore | 354 } // namespace WebCore |
| OLD | NEW |