| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 Google Inc. 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 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 #include "platform/mediastream/MediaStreamDescriptor.h" | 34 #include "platform/mediastream/MediaStreamDescriptor.h" |
| 35 #include "platform/mediastream/MediaStreamTrackSourcesRequest.h" | 35 #include "platform/mediastream/MediaStreamTrackSourcesRequest.h" |
| 36 #include "platform/mediastream/MediaStreamWebAudioSource.h" | 36 #include "platform/mediastream/MediaStreamWebAudioSource.h" |
| 37 #include "public/platform/Platform.h" | 37 #include "public/platform/Platform.h" |
| 38 #include "public/platform/WebAudioSourceProvider.h" | 38 #include "public/platform/WebAudioSourceProvider.h" |
| 39 #include "public/platform/WebMediaStream.h" | 39 #include "public/platform/WebMediaStream.h" |
| 40 #include "public/platform/WebMediaStreamCenter.h" | 40 #include "public/platform/WebMediaStreamCenter.h" |
| 41 #include "public/platform/WebMediaStreamTrack.h" | 41 #include "public/platform/WebMediaStreamTrack.h" |
| 42 #include "wtf/Assertions.h" | 42 #include "wtf/Assertions.h" |
| 43 #include "wtf/MainThread.h" | |
| 44 #include "wtf/PassOwnPtr.h" | 43 #include "wtf/PassOwnPtr.h" |
| 45 | 44 |
| 46 namespace blink { | 45 namespace blink { |
| 47 | 46 |
| 48 MediaStreamCenter& MediaStreamCenter::instance() | 47 MediaStreamCenter& MediaStreamCenter::instance() |
| 49 { | 48 { |
| 50 ASSERT(isMainThread()); | 49 ASSERT(isMainThread()); |
| 51 DEFINE_STATIC_LOCAL(MediaStreamCenter, center, ()); | 50 DEFINE_STATIC_LOCAL(MediaStreamCenter, center, ()); |
| 52 return center; | 51 return center; |
| 53 } | 52 } |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 { | 134 { |
| 136 MediaStreamDescriptor* stream = webStream; | 135 MediaStreamDescriptor* stream = webStream; |
| 137 MediaStreamDescriptorClient* client = stream->client(); | 136 MediaStreamDescriptorClient* client = stream->client(); |
| 138 if (client) | 137 if (client) |
| 139 client->streamEnded(); | 138 client->streamEnded(); |
| 140 else | 139 else |
| 141 stream->setEnded(); | 140 stream->setEnded(); |
| 142 } | 141 } |
| 143 | 142 |
| 144 } // namespace blink | 143 } // namespace blink |
| OLD | NEW |