Source/WebCore:
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 27 Jul 2015 18:41:45 +0000 (18:41 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 27 Jul 2015 18:41:45 +0000 (18:41 +0000)
Remove duplicate vectors inside of UserMediaRequest
https://bugs.webkit.org/show_bug.cgi?id=147321
<rdar://problem/22011290>

Patch by Matthew Daiter <mdaiter@apple.com> on 2015-07-27
Reviewed by Eric Carlson.

* Modules/mediastream/UserMediaRequest.h:
(WebCore::UserMediaRequest::deviceUIDsVideo): Deleted.
(WebCore::UserMediaRequest::deviceUIDsAudio): Deleted.

Source/WebKit2:
Renamed duplicate vectors inside UserMediaPermissionRequestProxy
https://bugs.webkit.org/show_bug.cgi?id=147321
<rdar://problem/22011290>

Patch by Matthew Daiter <mdaiter@apple.com> on 2015-07-27
Reviewed by Eric Carlson.

* UIProcess/UserMediaPermissionRequestProxy.cpp:
(WebKit::UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy):
* UIProcess/UserMediaPermissionRequestProxy.h:
(WebKit::UserMediaPermissionRequestProxy::videoDeviceUIDs):
(WebKit::UserMediaPermissionRequestProxy::audioDeviceUIDs):
(WebKit::UserMediaPermissionRequestProxy::deviceUIDsVideo): Deleted.
(WebKit::UserMediaPermissionRequestProxy::deviceUIDsAudio): Deleted.
* WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
(WebKit::UserMediaPermissionRequestManager::startRequest):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@187435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/Modules/mediastream/UserMediaRequest.h
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp
Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h
Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp

index 1770ed9..933b2e7 100644 (file)
@@ -1,3 +1,15 @@
+2015-07-27  Matthew Daiter  <mdaiter@apple.com>
+
+        Remove duplicate vectors inside of UserMediaRequest
+        https://bugs.webkit.org/show_bug.cgi?id=147321
+        <rdar://problem/22011290>
+
+        Reviewed by Eric Carlson.
+
+        * Modules/mediastream/UserMediaRequest.h:
+        (WebCore::UserMediaRequest::deviceUIDsVideo): Deleted.
+        (WebCore::UserMediaRequest::deviceUIDsAudio): Deleted.
+
 2015-07-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Pass a GstInstallPluginsContext to gst_install_plugins_async
index bcbce08..099e14f 100644 (file)
@@ -73,8 +73,6 @@ public:
     const Vector<String>& videoDeviceUIDs() const { return m_videoDeviceUIDs; }
     const Vector<String>& audioDeviceUIDs() const { return m_audioDeviceUIDs; }
 
-    const Vector<String>& deviceUIDsVideo() const { return m_deviceUIDsVideo; }
-    const Vector<String>& deviceUIDsAudio() const { return m_deviceUIDsAudio; }
 private:
     UserMediaRequest(ScriptExecutionContext*, UserMediaController*, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints, MediaDevices::Promise&&);
 
@@ -90,9 +88,6 @@ private:
     
     RefPtr<MediaConstraints> m_audioConstraints;
     RefPtr<MediaConstraints> m_videoConstraints;
-    
-    Vector<String> m_deviceUIDsVideo;
-    Vector<String> m_deviceUIDsAudio;
 
     Vector<String> m_videoDeviceUIDs;
     Vector<String> m_audioDeviceUIDs;
index 99724ea..b9893d8 100644 (file)
@@ -1,3 +1,21 @@
+2015-07-27  Matthew Daiter  <mdaiter@apple.com>
+
+        Renamed duplicate vectors inside UserMediaPermissionRequestProxy
+        https://bugs.webkit.org/show_bug.cgi?id=147321
+        <rdar://problem/22011290>
+
+        Reviewed by Eric Carlson.
+
+        * UIProcess/UserMediaPermissionRequestProxy.cpp:
+        (WebKit::UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy):
+        * UIProcess/UserMediaPermissionRequestProxy.h:
+        (WebKit::UserMediaPermissionRequestProxy::videoDeviceUIDs):
+        (WebKit::UserMediaPermissionRequestProxy::audioDeviceUIDs):
+        (WebKit::UserMediaPermissionRequestProxy::deviceUIDsVideo): Deleted.
+        (WebKit::UserMediaPermissionRequestProxy::deviceUIDsAudio): Deleted.
+        * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
+        (WebKit::UserMediaPermissionRequestManager::startRequest):
+
 2015-07-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Pass a GstInstallPluginsContext to gst_install_plugins_async
index b0232f2..c3509be 100644 (file)
@@ -31,8 +31,8 @@ UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy(UserMediaPermis
     , m_userMediaID(userMediaID)
     , m_requiresAudio(requiresAudio)
     , m_requiresVideo(requiresVideo)
-    , m_deviceUIDsVideo(deviceUIDsVideo)
-    , m_deviceUIDsAudio(deviceUIDsAudio)
+    , m_videoDeviceUIDs(deviceUIDsVideo)
+    , m_audiodeviceUIDs(deviceUIDsAudio)
 {
 }
 
index afb2d11..9fad767 100644 (file)
@@ -48,8 +48,8 @@ public:
     bool requiresAudio() const { return m_requiresAudio; }
     bool requiresVideo() const { return m_requiresVideo; }
     
-    const Vector<String>& deviceUIDsVideo() const { return m_deviceUIDsVideo; }
-    const Vector<String>& deviceUIDsAudio() const { return m_deviceUIDsAudio; }
+    const Vector<String>& videoDeviceUIDs() const { return m_videoDeviceUIDs; }
+    const Vector<String>& audioDeviceUIDs() const { return m_audiodeviceUIDs; }
 
 private:
     UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy&, uint64_t userMediaID, bool requiresAudio, bool requiresVideo, const Vector<String>& deviceUIDsVideo, const Vector<String>& deviceUIDsAudio);
@@ -58,8 +58,8 @@ private:
     uint64_t m_userMediaID;
     bool m_requiresAudio;
     bool m_requiresVideo;
-    Vector<String> m_deviceUIDsVideo;
-    Vector<String> m_deviceUIDsAudio;
+    Vector<String> m_videoDeviceUIDs;
+    Vector<String> m_audiodeviceUIDs;
 };
 
 } // namespace WebKit
index 9148d6c..55a11ff 100644 (file)
@@ -63,7 +63,7 @@ void UserMediaPermissionRequestManager::startRequest(UserMediaRequest& request)
     ASSERT(webFrame);
 
     SecurityOrigin* origin = request.securityOrigin();
-    m_page.send(Messages::WebPageProxy::RequestUserMediaPermissionForFrame(requestID, webFrame->frameID(), origin->databaseIdentifier(), request.requiresAudio(), request.requiresVideo(), request.deviceUIDsVideo(), request.deviceUIDsAudio()));
+    m_page.send(Messages::WebPageProxy::RequestUserMediaPermissionForFrame(requestID, webFrame->frameID(), origin->databaseIdentifier(), request.requiresAudio(), request.requiresVideo(), request.videoDeviceUIDs(), request.audioDeviceUIDs()));
 }
 
 void UserMediaPermissionRequestManager::cancelRequest(UserMediaRequest& request)