Diff
Modified: trunk/Source/WebCore/ChangeLog (188355 => 188356)
--- trunk/Source/WebCore/ChangeLog 2015-08-12 20:38:45 UTC (rev 188355)
+++ trunk/Source/WebCore/ChangeLog 2015-08-12 20:51:57 UTC (rev 188356)
@@ -1,3 +1,17 @@
+2015-08-12 Matthew Daiter <[email protected]>
+
+ Need to add stubs to enumerateDevices
+ https://bugs.webkit.org/show_bug.cgi?id=147903
+
+ Reviewed by Eric Carlson.
+
+ * Modules/mediastream/MediaDevices.cpp:
+ (WebCore::MediaDevices::enumerateDevices):
+ * Modules/mediastream/MediaDevices.h:
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::enumerateDevices):
+ * Modules/mediastream/UserMediaRequest.h:
+
2015-08-12 Matt Rajca <[email protected]>
Fixed the Release build when MEDIA_SESSION is enabled.
Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp (188355 => 188356)
--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2015-08-12 20:38:45 UTC (rev 188355)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2015-08-12 20:51:57 UTC (rev 188356)
@@ -65,6 +65,11 @@
UserMediaRequest::start(document(), options, WTF::move(promise), ec);
}
+void MediaDevices::enumerateDevices(EnumerateDevicePromise&& promise, ExceptionCode& ec) const
+{
+ UserMediaRequest::enumerateDevices(document(), WTF::move(promise), ec);
+}
+
} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.h (188355 => 188356)
--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.h 2015-08-12 20:38:45 UTC (rev 188355)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.h 2015-08-12 20:51:57 UTC (rev 188356)
@@ -44,6 +44,7 @@
class Dictionary;
class Document;
+class MediaDeviceInfo;
class MediaStream;
class NavigatorUserMediaError;
@@ -57,7 +58,9 @@
Document* document() const;
typedef DOMPromiseWithCallback<RefPtr<MediaStream>, RefPtr<NavigatorUserMediaError>> Promise;
+ typedef DOMPromiseWithCallback<Vector<RefPtr<MediaDeviceInfo>>, RefPtr<NavigatorUserMediaError>> EnumerateDevicePromise;
void getUserMedia(const Dictionary&, Promise&&, ExceptionCode&) const;
+ void enumerateDevices(EnumerateDevicePromise&&, ExceptionCode&) const;
private:
explicit MediaDevices(ScriptExecutionContext*);
Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (188355 => 188356)
--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-08-12 20:38:45 UTC (rev 188355)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-08-12 20:51:57 UTC (rev 188356)
@@ -68,6 +68,14 @@
return MediaConstraintsImpl::create();
}
+void UserMediaRequest::enumerateDevices(Document* document, MediaDevices::EnumerateDevicePromise&& promise, ExceptionCode& ec)
+{
+ // FIXME(146426): Implement this.
+ UNUSED_PARAM(document);
+ UNUSED_PARAM(promise);
+ UNUSED_PARAM(ec);
+}
+
void UserMediaRequest::start(Document* document, const Dictionary& options, MediaDevices::Promise&& promise, ExceptionCode& ec)
{
if (!options.isObject()) {
Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (188355 => 188356)
--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-08-12 20:38:45 UTC (rev 188355)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-08-12 20:51:57 UTC (rev 188356)
@@ -59,6 +59,8 @@
class UserMediaRequest : public MediaStreamCreationClient, public ContextDestructionObserver {
public:
static void start(Document*, const Dictionary&, MediaDevices::Promise&&, ExceptionCode&);
+ static void enumerateDevices(Document*, MediaDevices::EnumerateDevicePromise&&, ExceptionCode&);
+
~UserMediaRequest();
WEBCORE_EXPORT SecurityOrigin* securityOrigin() const;
