From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Wed, 17 Oct 2012 16:21:14 +0200
Subject: Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00
 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
---
 Source/WebKit/chromium/src/WebUserMediaRequest.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'Source/WebKit/chromium/src/WebUserMediaRequest.cpp')

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());
-- 
cgit v1.2.1