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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 ASSERT(isMainThread()); | 61 ASSERT(isMainThread()); |
62 | 62 |
63 if (!scriptExecutionContext || !source) | 63 if (!scriptExecutionContext || !source) |
64 return String(); | 64 return String(); |
65 | 65 |
66 KURL publicURL = BlobURL::createPublicURL(scriptExecutionContext->securityOr
igin()); | 66 KURL publicURL = BlobURL::createPublicURL(scriptExecutionContext->securityOr
igin()); |
67 if (publicURL.isEmpty()) | 67 if (publicURL.isEmpty()) |
68 return String(); | 68 return String(); |
69 | 69 |
70 MediaSourceRegistry::registry().registerMediaSourceURL(publicURL, source); | 70 MediaSourceRegistry::registry().registerMediaSourceURL(publicURL, source); |
71 scriptExecutionContext->publicURLManager().sourceURLs().add(publicURL.string
()); | 71 scriptExecutionContext->publicURLManager().streamURLs().add(publicURL.string
()); |
72 | 72 |
73 return publicURL.string(); | 73 return publicURL.string(); |
74 } | 74 } |
75 #endif | 75 #endif |
76 | 76 |
77 #if ENABLE(MEDIA_STREAM) | 77 #if ENABLE(MEDIA_STREAM) |
78 String DOMURL::createObjectURL(ScriptExecutionContext* scriptExecutionContext, M
ediaStream* stream) | 78 String DOMURL::createObjectURL(ScriptExecutionContext* scriptExecutionContext, M
ediaStream* stream) |
79 { | 79 { |
80 if (!scriptExecutionContext || !stream) | 80 if (!scriptExecutionContext || !stream) |
81 return String(); | 81 return String(); |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 ASSERT(isMainThread()); | 131 ASSERT(isMainThread()); |
132 MediaStreamRegistry::registry().unregisterMediaStreamURL(url); | 132 MediaStreamRegistry::registry().unregisterMediaStreamURL(url); |
133 streamURLs.remove(url.string()); | 133 streamURLs.remove(url.string()); |
134 } | 134 } |
135 #endif | 135 #endif |
136 } | 136 } |
137 | 137 |
138 } // namespace WebCore | 138 } // namespace WebCore |
139 | 139 |
140 #endif // ENABLE(BLOB) | 140 #endif // ENABLE(BLOB) |
OLD | NEW |