Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (188492 => 188493)
--- trunk/Source/WebCore/CMakeLists.txt 2015-08-14 22:11:22 UTC (rev 188492)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-14 22:11:37 UTC (rev 188493)
@@ -2236,6 +2236,7 @@
platform/graphics/transforms/TransformationMatrix.cpp
platform/graphics/transforms/TranslateTransformOperation.cpp
+ platform/mediastream/MediaDevicesPrivate.cpp
platform/mediastream/MediaStreamPrivate.cpp
platform/mediastream/MediaStreamTrackPrivate.cpp
platform/mediastream/RTCIceCandidateDescriptor.cpp
Modified: trunk/Source/WebCore/ChangeLog (188492 => 188493)
--- trunk/Source/WebCore/ChangeLog 2015-08-14 22:11:22 UTC (rev 188492)
+++ trunk/Source/WebCore/ChangeLog 2015-08-14 22:11:37 UTC (rev 188493)
@@ -1,3 +1,25 @@
+2015-08-14 Matthew Daiter <[email protected]>
+
+ Implementing enumerateDevices
+ https://bugs.webkit.org/show_bug.cgi?id=146426
+ <rdar://problem/21599847>
+
+ Reviewed by Eric Carlson.
+
+ * CMakeLists.txt:
+ * Modules/mediastream/MediaDeviceInfo.idl:
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::enumerateDevices):
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/mediastream/MediaDevicesPrivate.cpp:
+ (WebCore::MediaDevicesPrivate::create):
+ (WebCore::MediaDevicesPrivate::MediaDevicesPrivate):
+ (WebCore::MediaDevicesPrivate::didCompleteRequest):
+ (WebCore::MediaDevicesPrivate::availableMediaDevices):
+ * platform/mediastream/MediaDevicesPrivate.h:
+ (WebCore::MediaDevicesPrivate::~MediaDevicesPrivate):
+ (WebCore::MediaDevicesPrivate::capturedDevices):
+
2015-08-13 Andy Estes <[email protected]>
[Cocoa] Downloads do not start if policy decision is made asynchronously
Modified: trunk/Source/WebCore/Modules/mediastream/MediaDeviceInfo.idl (188492 => 188493)
--- trunk/Source/WebCore/Modules/mediastream/MediaDeviceInfo.idl 2015-08-14 22:11:22 UTC (rev 188492)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDeviceInfo.idl 2015-08-14 22:11:37 UTC (rev 188493)
@@ -1,3 +1,28 @@
+/*
+* Copyright (C) 2015 Apple Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
[
NoInterfaceObject,
Conditional=MEDIA_STREAM,
Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (188492 => 188493)
--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-08-14 22:11:22 UTC (rev 188492)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-08-14 22:11:37 UTC (rev 188493)
@@ -41,9 +41,11 @@
#include "Document.h"
#include "ExceptionCode.h"
#include "Frame.h"
+#include "JSMediaDeviceInfo.h"
#include "JSMediaStream.h"
#include "JSNavigatorUserMediaError.h"
#include "MediaConstraintsImpl.h"
+#include "MediaDevicesPrivate.h"
#include "MediaStream.h"
#include "MediaStreamPrivate.h"
#include "NavigatorUserMediaErrorCallback.h"
@@ -68,12 +70,11 @@
return MediaConstraintsImpl::create();
}
-void UserMediaRequest::enumerateDevices(Document* document, MediaDevices::EnumerateDevicePromise&& promise, ExceptionCode& ec)
+void UserMediaRequest::enumerateDevices(Document* document, MediaDevices::EnumerateDevicePromise&& promise, ExceptionCode&)
{
- // FIXME(146426): Implement this.
- UNUSED_PARAM(document);
- UNUSED_PARAM(promise);
- UNUSED_PARAM(ec);
+ RefPtr<MediaDevicesPrivate> deviceClient = MediaDevicesPrivate::create();
+ RealtimeMediaSourceCenter::singleton().getMediaStreamTrackSources(deviceClient);
+ promise.resolve(deviceClient->availableMediaDevices(*document));
}
void UserMediaRequest::start(Document* document, const Dictionary& options, MediaDevices::Promise&& promise, ExceptionCode& ec)
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (188492 => 188493)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-14 22:11:22 UTC (rev 188492)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-14 22:11:37 UTC (rev 188493)
@@ -646,6 +646,8 @@
152A29B51B4EF5BA00B52AE0 /* MediaDevicesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 152A29B31B4EF59600B52AE0 /* MediaDevicesPrivate.h */; };
15739BBA1B42012A00D258C1 /* JSMediaDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15739BB81B42012200D258C1 /* JSMediaDevices.cpp */; };
15739BBB1B42012D00D258C1 /* JSMediaDevices.h in Headers */ = {isa = PBXBuildFile; fileRef = 15739BB91B42012200D258C1 /* JSMediaDevices.h */; };
+ 159741DA1B7D13F900201C92 /* JSMediaDeviceInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 157CC2611B7C1CA400D8D075 /* JSMediaDeviceInfo.cpp */; };
+ 159741DB1B7D140100201C92 /* JSMediaDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 157CC2621B7C1CA400D8D075 /* JSMediaDeviceInfo.h */; };
159AE82B1B3A402F0037478B /* MediaDeviceInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 159AE82A1B3A402F0037478B /* MediaDeviceInfo.cpp */; };
15C7708D100D3C6B005BA267 /* ValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C7708A100D3C6A005BA267 /* ValidityState.h */; };
15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C77091100D3CA8005BA267 /* JSValidityState.h */; };
@@ -7792,6 +7794,8 @@
152A29B31B4EF59600B52AE0 /* MediaDevicesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaDevicesPrivate.h; sourceTree = "<group>"; };
15739BB81B42012200D258C1 /* JSMediaDevices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaDevices.cpp; sourceTree = "<group>"; };
15739BB91B42012200D258C1 /* JSMediaDevices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaDevices.h; sourceTree = "<group>"; };
+ 157CC2611B7C1CA400D8D075 /* JSMediaDeviceInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaDeviceInfo.cpp; sourceTree = "<group>"; };
+ 157CC2621B7C1CA400D8D075 /* JSMediaDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaDeviceInfo.h; sourceTree = "<group>"; };
159AE82A1B3A402F0037478B /* MediaDeviceInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaDeviceInfo.cpp; sourceTree = "<group>"; };
15C77089100D3C6A005BA267 /* ValidityState.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ValidityState.idl; sourceTree = "<group>"; };
15C7708A100D3C6A005BA267 /* ValidityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValidityState.h; sourceTree = "<group>"; };
@@ -14968,6 +14972,8 @@
07CFD99317D01405001C4FFC /* MediaStream */ = {
isa = PBXGroup;
children = (
+ 157CC2611B7C1CA400D8D075 /* JSMediaDeviceInfo.cpp */,
+ 157CC2621B7C1CA400D8D075 /* JSMediaDeviceInfo.h */,
15739BB81B42012200D258C1 /* JSMediaDevices.cpp */,
15739BB91B42012200D258C1 /* JSMediaDevices.h */,
07C59B6F17F79C7C000FBCBB /* JSMediaSourceStates.cpp */,
@@ -26152,6 +26158,7 @@
1A569D0B0D7E2B82007C3983 /* NP_jsobject.h in Headers */,
1A927FD21416A15B003A83C8 /* npapi.h in Headers */,
1A219B3B0DCA87AB0040E3A0 /* npfunctions.h in Headers */,
+ 159741DB1B7D140100201C92 /* JSMediaDeviceInfo.h in Headers */,
1A927FD31416A15B003A83C8 /* npruntime.h in Headers */,
1A569D0F0D7E2B82007C3983 /* npruntime_impl.h in Headers */,
1A569D100D7E2B82007C3983 /* npruntime_internal.h in Headers */,
@@ -30106,6 +30113,7 @@
0F09087F1444FDB200028917 /* ScrollbarTheme.cpp in Sources */,
BC14028A0E83680800319717 /* ScrollbarThemeComposite.cpp in Sources */,
44C991820F3D1E0D00586670 /* ScrollbarThemeIOS.mm in Sources */,
+ 159741DA1B7D13F900201C92 /* JSMediaDeviceInfo.cpp in Sources */,
BCEF869F0E844E9D00A85CD5 /* ScrollbarThemeMac.mm in Sources */,
0FE71405142170B800DB33BA /* ScrollbarThemeMock.cpp in Sources */,
5D925B670F64D4DD00B847F0 /* ScrollBehavior.cpp in Sources */,
Modified: trunk/Source/WebCore/platform/mediastream/MediaDevicesPrivate.cpp (188492 => 188493)
--- trunk/Source/WebCore/platform/mediastream/MediaDevicesPrivate.cpp 2015-08-14 22:11:22 UTC (rev 188492)
+++ trunk/Source/WebCore/platform/mediastream/MediaDevicesPrivate.cpp 2015-08-14 22:11:37 UTC (rev 188493)
@@ -29,21 +29,27 @@
#if ENABLE(MEDIA_STREAM)
-#include "AVCaptureDeviceManager.h"
-#include "AVMediaCaptureSource.h"
-#include "MediaStreamTrackSourcesRequestClient.h"
-
namespace WebCore {
+Ref<MediaDevicesPrivate> MediaDevicesPrivate::create()
+{
+ return adoptRef(*new MediaDevicesPrivate);
+}
+
MediaDevicesPrivate::MediaDevicesPrivate()
+ : m_capturedDevices()
{
}
+
+void MediaDevicesPrivate::didCompleteRequest(const Vector<RefPtr<TrackSourceInfo>>& capturedDevices)
+{
+ m_capturedDevices = capturedDevices;
+}
Vector<RefPtr<MediaDeviceInfo>> MediaDevicesPrivate::availableMediaDevices(ScriptExecutionContext& context)
{
- Vector<RefPtr<TrackSourceInfo>> capturedDevices = AVCaptureDeviceManager::singleton().getSourcesInfo("");
Vector<RefPtr<MediaDeviceInfo>> mediaDevicesInfo;
- for (auto device : capturedDevices) {
+ for (auto device : m_capturedDevices) {
TrackSourceInfo* trackInfo = device.get();
String deviceType = trackInfo->kind() == TrackSourceInfo::SourceKind::Audio ? MediaDeviceInfo::audioInputType() : MediaDeviceInfo::videoInputType();
mediaDevicesInfo.append(MediaDeviceInfo::create(&context, trackInfo->label(), trackInfo->deviceId(), trackInfo->groupId(), deviceType));
Modified: trunk/Source/WebCore/platform/mediastream/MediaDevicesPrivate.h (188492 => 188493)
--- trunk/Source/WebCore/platform/mediastream/MediaDevicesPrivate.h 2015-08-14 22:11:22 UTC (rev 188492)
+++ trunk/Source/WebCore/platform/mediastream/MediaDevicesPrivate.h 2015-08-14 22:11:37 UTC (rev 188493)
@@ -29,8 +29,8 @@
#if ENABLE(MEDIA_STREAM)
-#include "AVCaptureDeviceManager.h"
#include "MediaDeviceInfo.h"
+#include "MediaStreamTrackSourcesRequestClient.h"
#include <wtf/Forward.h>
#include <wtf/RefPtr.h>
@@ -38,13 +38,25 @@
namespace WebCore {
-class MediaDevicesPrivate : public std::unique_ptr<MediaDevicesPrivate> {
+class MediaDevicesPrivate : public MediaStreamTrackSourcesRequestClient {
public:
+ static Ref<MediaDevicesPrivate> create();
+
MediaDevicesPrivate();
- virtual ~MediaDevicesPrivate() { }
+ ~MediaDevicesPrivate() { }
- virtual Vector<RefPtr<MediaDeviceInfo>> availableMediaDevices(ScriptExecutionContext&);
+ Vector<RefPtr<MediaDeviceInfo>> availableMediaDevices(ScriptExecutionContext&);
+
+ // FIXME(148041): requestOrigin inside of getMediaStreamTrackSources not used
+ const String& requestOrigin() const override { return emptyString(); }
+
+ void didCompleteRequest(const Vector<RefPtr<TrackSourceInfo>>&) override;
+
+ Vector<RefPtr<TrackSourceInfo>> capturedDevices() const { return m_capturedDevices; }
+
+private:
+ Vector<RefPtr<TrackSourceInfo>> m_capturedDevices;
};
}
