diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 16:08:57 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 16:08:57 +0200 |
commit | 5466563f4b5b6b86523e3f89bb7f77e5b5270c78 (patch) | |
tree | 8caccf7cd03a15207cde3ba282c88bf132482a91 /Source/WebKit/chromium/src/WebUserMediaRequest.cpp | |
parent | 33b26980cb24288b5a9f2590ccf32a949281bb79 (diff) | |
download | qtwebkit-5466563f4b5b6b86523e3f89bb7f77e5b5270c78.tar.gz |
Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)
WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314
Diffstat (limited to 'Source/WebKit/chromium/src/WebUserMediaRequest.cpp')
-rw-r--r-- | Source/WebKit/chromium/src/WebUserMediaRequest.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/WebUserMediaRequest.cpp b/Source/WebKit/chromium/src/WebUserMediaRequest.cpp index 26f17c35b..ffecb0aed 100644 --- a/Source/WebKit/chromium/src/WebUserMediaRequest.cpp +++ b/Source/WebKit/chromium/src/WebUserMediaRequest.cpp @@ -35,16 +35,18 @@ #include "WebUserMediaRequest.h" #include "Document.h" +#include "MediaConstraints.h" #include "MediaStreamDescriptor.h" #include "MediaStreamSource.h" #include "SecurityOrigin.h" #include "UserMediaRequest.h" #include "WebDocument.h" #include "WebSecurityOrigin.h" -#include "platform/WebMediaStreamDescriptor.h" -#include "platform/WebMediaStreamSource.h" -#include "platform/WebString.h" -#include "platform/WebVector.h" +#include <public/WebMediaConstraints.h> +#include <public/WebMediaStreamDescriptor.h> +#include <public/WebMediaStreamSource.h> +#include <public/WebString.h> +#include <public/WebVector.h> #include <wtf/Vector.h> using namespace WebCore; @@ -73,6 +75,18 @@ bool WebUserMediaRequest::video() const return m_private->video(); } +WebMediaConstraints WebUserMediaRequest::audioConstraints() const +{ + ASSERT(!isNull()); + return m_private->audioConstraints(); +} + +WebMediaConstraints WebUserMediaRequest::videoConstraints() const +{ + ASSERT(!isNull()); + return m_private->videoConstraints(); +} + WebSecurityOrigin WebUserMediaRequest::securityOrigin() const { ASSERT(!isNull() && m_private->scriptExecutionContext()); |