| 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. |
| 11 * 2. Redistributions in binary form must reproduce the above copyright | 11 * 2. Redistributions in binary form must reproduce the above copyright |
| 12 * notice, this list of conditions and the following disclaimer in the | 12 * notice, this list of conditions and the following disclaimer in the |
| 13 * documentation and/or other materials provided with the distribution. | 13 * documentation and/or other materials provided with the distribution. |
| 14 * | 14 * |
| 15 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 15 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
| 16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 18 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 18 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
| 19 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 19 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 20 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 20 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 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 "core/html/DOMURL.h" |
| 30 | 30 |
| 31 #include "PublicURLManager.h" | |
| 32 #include "core/dom/ActiveDOMObject.h" | 31 #include "core/dom/ActiveDOMObject.h" |
| 33 #include "core/dom/ScriptExecutionContext.h" | 32 #include "core/dom/ScriptExecutionContext.h" |
| 34 #include "core/fileapi/Blob.h" | 33 #include "core/fileapi/Blob.h" |
| 35 #include "core/fileapi/BlobURL.h" | 34 #include "core/fileapi/BlobURL.h" |
| 36 #include "core/fileapi/ThreadableBlobRegistry.h" | 35 #include "core/fileapi/ThreadableBlobRegistry.h" |
| 36 #include "core/html/PublicURLManager.h" |
| 37 #include "core/loader/cache/MemoryCache.h" | 37 #include "core/loader/cache/MemoryCache.h" |
| 38 #include "core/page/SecurityOrigin.h" | 38 #include "core/page/SecurityOrigin.h" |
| 39 #include "core/platform/KURL.h" | 39 #include "core/platform/KURL.h" |
| 40 #include "core/platform/network/ResourceRequest.h" | 40 #include "core/platform/network/ResourceRequest.h" |
| 41 #include "modules/mediasource/MediaSource.h" | 41 #include "modules/mediasource/MediaSource.h" |
| 42 #include "modules/mediasource/MediaSourceRegistry.h" | 42 #include "modules/mediasource/MediaSourceRegistry.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) |
| (...skipping 81 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 |