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 27 matching lines...) Expand all Loading... |
38 #include "bindings/core/v8/ExceptionState.h" | 38 #include "bindings/core/v8/ExceptionState.h" |
39 #include "core/dom/Document.h" | 39 #include "core/dom/Document.h" |
40 #include "core/dom/ExceptionCode.h" | 40 #include "core/dom/ExceptionCode.h" |
41 #include "core/dom/SpaceSplitString.h" | 41 #include "core/dom/SpaceSplitString.h" |
42 #include "modules/mediastream/MediaConstraintsImpl.h" | 42 #include "modules/mediastream/MediaConstraintsImpl.h" |
43 #include "modules/mediastream/MediaStream.h" | 43 #include "modules/mediastream/MediaStream.h" |
44 #include "modules/mediastream/UserMediaController.h" | 44 #include "modules/mediastream/UserMediaController.h" |
45 #include "platform/mediastream/MediaStreamCenter.h" | 45 #include "platform/mediastream/MediaStreamCenter.h" |
46 #include "platform/mediastream/MediaStreamDescriptor.h" | 46 #include "platform/mediastream/MediaStreamDescriptor.h" |
47 | 47 |
48 namespace WebCore { | 48 namespace blink { |
49 | 49 |
50 static blink::WebMediaConstraints parseOptions(const Dictionary& options, const
String& mediaType, ExceptionState& exceptionState) | 50 static blink::WebMediaConstraints parseOptions(const Dictionary& options, const
String& mediaType, ExceptionState& exceptionState) |
51 { | 51 { |
52 blink::WebMediaConstraints constraints; | 52 blink::WebMediaConstraints constraints; |
53 | 53 |
54 Dictionary constraintsDictionary; | 54 Dictionary constraintsDictionary; |
55 bool ok = options.get(mediaType, constraintsDictionary); | 55 bool ok = options.get(mediaType, constraintsDictionary); |
56 if (ok && !constraintsDictionary.isUndefinedOrNull()) | 56 if (ok && !constraintsDictionary.isUndefinedOrNull()) |
57 constraints = MediaConstraintsImpl::create(constraintsDictionary, except
ionState); | 57 constraints = MediaConstraintsImpl::create(constraintsDictionary, except
ionState); |
58 else { | 58 else { |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 void UserMediaRequest::contextDestroyed() | 178 void UserMediaRequest::contextDestroyed() |
179 { | 179 { |
180 if (m_controller) { | 180 if (m_controller) { |
181 m_controller->cancelUserMediaRequest(this); | 181 m_controller->cancelUserMediaRequest(this); |
182 m_controller = 0; | 182 m_controller = 0; |
183 } | 183 } |
184 | 184 |
185 ContextLifecycleObserver::contextDestroyed(); | 185 ContextLifecycleObserver::contextDestroyed(); |
186 } | 186 } |
187 | 187 |
188 } // namespace WebCore | 188 } // namespace blink |
OLD | NEW |