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) 2012 Motorola Mobility Inc. | 3 * Copyright (C) 2012 Motorola Mobility Inc. |
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 10 matching lines...) Expand all Loading... |
21 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 21 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
22 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
25 */ | 25 */ |
26 | 26 |
27 #include "config.h" | 27 #include "config.h" |
28 | 28 |
29 #include "DOMURL.h" | 29 #include "DOMURL.h" |
30 | 30 |
31 #include "ActiveDOMObject.h" | |
32 #include "Blob.h" | 31 #include "Blob.h" |
33 #include "BlobURL.h" | 32 #include "BlobURL.h" |
34 #include "MediaSource.h" | 33 #include "MediaSource.h" |
35 #include "MediaSourceRegistry.h" | 34 #include "MediaSourceRegistry.h" |
36 #include "PublicURLManager.h" | 35 #include "PublicURLManager.h" |
37 #include "ScriptExecutionContext.h" | |
38 #include "ThreadableBlobRegistry.h" | 36 #include "ThreadableBlobRegistry.h" |
| 37 #include "core/dom/ActiveDOMObject.h" |
| 38 #include "core/dom/ScriptExecutionContext.h" |
39 #include "core/loader/cache/MemoryCache.h" | 39 #include "core/loader/cache/MemoryCache.h" |
40 #include "core/page/SecurityOrigin.h" | 40 #include "core/page/SecurityOrigin.h" |
41 #include "core/platform/KURL.h" | 41 #include "core/platform/KURL.h" |
42 #include "core/platform/network/ResourceRequest.h" | 42 #include "core/platform/network/ResourceRequest.h" |
43 #include <wtf/MainThread.h> | 43 #include <wtf/MainThread.h> |
44 #include <wtf/PassOwnPtr.h> | 44 #include <wtf/PassOwnPtr.h> |
45 | 45 |
46 #if ENABLE(MEDIA_STREAM) | 46 #if ENABLE(MEDIA_STREAM) |
47 #include "MediaStream.h" | 47 #include "MediaStream.h" |
48 #include "MediaStreamRegistry.h" | 48 #include "MediaStreamRegistry.h" |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 // FIXME: make sure of this assertion below. Raise a spec question if re
quired. | 128 // FIXME: make sure of this assertion below. Raise a spec question if re
quired. |
129 // Since WebWorkers cannot obtain Stream objects, we should be on the ma
in thread. | 129 // Since WebWorkers cannot obtain Stream objects, we should be on the ma
in thread. |
130 ASSERT(isMainThread()); | 130 ASSERT(isMainThread()); |
131 MediaStreamRegistry::registry().unregisterMediaStreamURL(url); | 131 MediaStreamRegistry::registry().unregisterMediaStreamURL(url); |
132 streamURLs.remove(url.string()); | 132 streamURLs.remove(url.string()); |
133 } | 133 } |
134 #endif | 134 #endif |
135 } | 135 } |
136 | 136 |
137 } // namespace WebCore | 137 } // namespace WebCore |
OLD | NEW |