| 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 17 matching lines...) Expand all Loading... |
| 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 #if ENABLE(MEDIA_STREAM) | 33 #if ENABLE(MEDIA_STREAM) |
| 34 | 34 |
| 35 #include "WebUserMediaRequest.h" | 35 #include "WebUserMediaRequest.h" |
| 36 | 36 |
| 37 #include "Document.h" | 37 #include "Document.h" |
| 38 #include "MediaConstraints.h" | |
| 39 #include "MediaStreamDescriptor.h" | |
| 40 #include "MediaStreamSource.h" | |
| 41 #include "SecurityOrigin.h" | 38 #include "SecurityOrigin.h" |
| 42 #include "UserMediaRequest.h" | 39 #include "UserMediaRequest.h" |
| 43 #include "WebDocument.h" | 40 #include "WebDocument.h" |
| 44 #include "WebSecurityOrigin.h" | 41 #include "WebSecurityOrigin.h" |
| 42 #include "core/platform/mediastream/MediaConstraints.h" |
| 43 #include "core/platform/mediastream/MediaStreamDescriptor.h" |
| 44 #include "core/platform/mediastream/MediaStreamSource.h" |
| 45 #include <public/WebMediaConstraints.h> | 45 #include <public/WebMediaConstraints.h> |
| 46 #include <public/WebMediaStream.h> | 46 #include <public/WebMediaStream.h> |
| 47 #include <public/WebMediaStreamSource.h> | 47 #include <public/WebMediaStreamSource.h> |
| 48 #include <public/WebString.h> | 48 #include <public/WebString.h> |
| 49 #include <public/WebVector.h> | 49 #include <public/WebVector.h> |
| 50 #include <wtf/Vector.h> | 50 #include <wtf/Vector.h> |
| 51 | 51 |
| 52 using namespace WebCore; | 52 using namespace WebCore; |
| 53 | 53 |
| 54 namespace WebKit { | 54 namespace WebKit { |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 | 125 |
| 126 WebUserMediaRequest::operator UserMediaRequest*() const | 126 WebUserMediaRequest::operator UserMediaRequest*() const |
| 127 { | 127 { |
| 128 return m_private.get(); | 128 return m_private.get(); |
| 129 } | 129 } |
| 130 | 130 |
| 131 } // namespace WebKit | 131 } // namespace WebKit |
| 132 | 132 |
| 133 #endif // ENABLE(MEDIA_STREAM) | 133 #endif // ENABLE(MEDIA_STREAM) |
| 134 | 134 |
| OLD | NEW |