diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/page/Navigator.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/page/Navigator.h')
| -rw-r--r-- | Source/WebCore/page/Navigator.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/WebCore/page/Navigator.h b/Source/WebCore/page/Navigator.h index 8514279..f0963ac 100644 --- a/Source/WebCore/page/Navigator.h +++ b/Source/WebCore/page/Navigator.h @@ -36,6 +36,8 @@ class DOMMimeTypeArray; class DOMPluginArray; class Frame; class Geolocation; +class NavigatorUserMediaErrorCallback; +class NavigatorUserMediaSuccessCallback; class PluginData; #if PLATFORM(ANDROID) class ApplicationInstalledCallback; @@ -84,6 +86,11 @@ public: void registerProtocolHandler(const String& scheme, const String& url, const String& title, ExceptionCode&); #endif +#if ENABLE(MEDIA_STREAM) + virtual void webkitGetUserMedia(const String& options, PassRefPtr<NavigatorUserMediaSuccessCallback>, + PassRefPtr<NavigatorUserMediaErrorCallback> = 0); +#endif + private: Navigator(Frame*); Frame* m_frame; |