OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 16 matching lines...) Expand all Loading... |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 | 32 |
33 #include "WebMediaStreamRegistry.h" | 33 #include "WebMediaStreamRegistry.h" |
34 | 34 |
35 #include "core/platform/mediastream/MediaStreamDescriptor.h" | 35 #include "core/platform/mediastream/MediaStreamDescriptor.h" |
36 #include "modules/mediastream/MediaStreamRegistry.h" | 36 #include "modules/mediastream/MediaStreamRegistry.h" |
| 37 #include "platform/weborigin/KURL.h" |
37 #include "public/platform/WebMediaStream.h" | 38 #include "public/platform/WebMediaStream.h" |
38 #include "public/platform/WebString.h" | 39 #include "public/platform/WebString.h" |
39 #include "public/platform/WebURL.h" | 40 #include "public/platform/WebURL.h" |
40 #include "weborigin/KURL.h" | |
41 | 41 |
42 using namespace WebCore; | 42 using namespace WebCore; |
43 | 43 |
44 namespace blink { | 44 namespace blink { |
45 | 45 |
46 WebMediaStream WebMediaStreamRegistry::lookupMediaStreamDescriptor(const WebURL&
url) | 46 WebMediaStream WebMediaStreamRegistry::lookupMediaStreamDescriptor(const WebURL&
url) |
47 { | 47 { |
48 return WebMediaStream(MediaStreamRegistry::registry().lookupMediaStreamDescr
iptor(KURL(url).string())); | 48 return WebMediaStream(MediaStreamRegistry::registry().lookupMediaStreamDescr
iptor(KURL(url).string())); |
49 } | 49 } |
50 | 50 |
51 } // namespace blink | 51 } // namespace blink |
OLD | NEW |