summaryrefslogtreecommitdiff
path: root/Source/WebCore/Modules/mediastream/UserMediaClient.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/Modules/mediastream/UserMediaClient.h')
-rw-r--r--Source/WebCore/Modules/mediastream/UserMediaClient.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/WebCore/Modules/mediastream/UserMediaClient.h b/Source/WebCore/Modules/mediastream/UserMediaClient.h
index b847c7867..f8627acec 100644
--- a/Source/WebCore/Modules/mediastream/UserMediaClient.h
+++ b/Source/WebCore/Modules/mediastream/UserMediaClient.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2011 Ericsson AB. All rights reserved.
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -28,15 +29,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef UserMediaClient_h
-#define UserMediaClient_h
+#pragma once
#if ENABLE(MEDIA_STREAM)
-#include <wtf/PassRefPtr.h>
-
namespace WebCore {
+class MediaDevicesEnumerationRequest;
class Page;
class UserMediaRequest;
@@ -44,17 +43,18 @@ class UserMediaClient {
public:
virtual void pageDestroyed() = 0;
- virtual void requestPermission(PassRefPtr<UserMediaRequest>) = 0;
- virtual void cancelRequest(UserMediaRequest*) = 0;
+ virtual void requestUserMediaAccess(UserMediaRequest&) = 0;
+ virtual void cancelUserMediaAccessRequest(UserMediaRequest&) = 0;
+
+ virtual void enumerateMediaDevices(MediaDevicesEnumerationRequest&) = 0;
+ virtual void cancelMediaDevicesEnumerationRequest(MediaDevicesEnumerationRequest&) = 0;
protected:
virtual ~UserMediaClient() { }
};
-void provideUserMediaTo(Page*, UserMediaClient*);
+WEBCORE_EXPORT void provideUserMediaTo(Page*, UserMediaClient*);
} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
-
-#endif // UserMediaClient_h