Merge WebKit at r84325: Initial merge by git.

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

diff --git a/Source/WebCore/page/Navigator.cpp b/Source/WebCore/page/Navigator.cpp
index 9526536..773483e 100644 (file)
--- a/Source/WebCore/page/Navigator.cpp
+++ b/Source/WebCore/page/Navigator.cpp
@@ -34,6 +34,8 @@
 #include "Geolocation.h"
 #include "KURL.h"
 #include "Language.h"
+#include "NavigatorUserMediaErrorCallback.h"
+#include "NavigatorUserMediaSuccessCallback.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include "PlatformString.h"
@@ -281,4 +283,13 @@ void Navigator::registerProtocolHandler(const String& scheme, const String& url,
 }
 #endif
 
+#if ENABLE(MEDIA_STREAM)
+void Navigator::webkitGetUserMedia(const String& options,
+                                   PassRefPtr<NavigatorUserMediaSuccessCallback> successCallback,
+                                   PassRefPtr<NavigatorUserMediaErrorCallback> errorCallback)
+{
+    // FIXME: implement a call to the media stream context when available.
+}
+#endif
+
 } // namespace WebCore