Merge WebKit at r84325: Initial merge by git.

[android-x86/external-webkit.git] / Source / WebCore / page / Navigator.idl

diff --git a/Source/WebCore/page/Navigator.idl b/Source/WebCore/page/Navigator.idl
index b92ef4a..9b54f2f 100644 (file)
--- a/Source/WebCore/page/Navigator.idl
+++ b/Source/WebCore/page/Navigator.idl
@@ -37,7 +37,7 @@ module window {
         readonly attribute DOMString vendorSub;
         readonly attribute boolean cookieEnabled;
         boolean javaEnabled();
-        
+
         readonly attribute boolean onLine;
 
 #if defined(ENABLE_CONNECTION) && ENABLE_CONNECTION
@@ -62,6 +62,12 @@ module window {
         void registerProtocolHandler(in DOMString scheme, in DOMString url, in DOMString title)
             raises(DomException);
 #endif
+
+#if defined(ENABLE_MEDIA_STREAM) && ENABLE_MEDIA_STREAM
+        [Custom, EnabledAtRuntime] void webkitGetUserMedia(in DOMString options,
+                                                           in [Callback=FunctionOnly] NavigatorUserMediaSuccessCallback successCallback,
+                                                           in [Callback=FunctionOnly, Optional] NavigatorUserMediaErrorCallback errorCallback);
+#endif
     };
 
 }