Title: [209449] trunk/Source/WebKit2

Diff

Modified: trunk/Source/WebKit2/CMakeLists.txt (209448 => 209449)


--- trunk/Source/WebKit2/CMakeLists.txt	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/CMakeLists.txt	2016-12-07 05:31:57 UTC (rev 209449)
@@ -369,7 +369,6 @@
     UIProcess/UserMediaPermissionCheckProxy.cpp
     UIProcess/UserMediaPermissionRequestManagerProxy.cpp
     UIProcess/UserMediaPermissionRequestProxy.cpp
-    UIProcess/UserMediaProcessManager.cpp
     UIProcess/VisitedLinkStore.cpp
     UIProcess/WebBackForwardList.cpp
     UIProcess/WebColorPicker.cpp
@@ -582,7 +581,6 @@
     WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
     WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp
 
-    WebProcess/MediaStream/MediaDeviceSandboxExtensions.cpp
     WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp
 
     WebProcess/Network/NetworkProcessConnection.cpp

Modified: trunk/Source/WebKit2/ChangeLog (209448 => 209449)


--- trunk/Source/WebKit2/ChangeLog	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/ChangeLog	2016-12-07 05:31:57 UTC (rev 209449)
@@ -1,3 +1,16 @@
+2016-12-06  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r209422.
+
+        This change caused assertion failures during API tests.
+
+        Reverted changeset:
+
+        "[MediaStream][Mac] Revoke sandbox extensions when capture
+        ends"
+        https://bugs.webkit.org/show_bug.cgi?id=165476
+        http://trac.webkit.org/changeset/209422
+
 2016-12-06  Dean Jackson  <[email protected]>
 
         Include default value in Experimental Feature information

Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (209448 => 209449)


--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp	2016-12-07 05:31:57 UTC (rev 209449)
@@ -22,7 +22,6 @@
 
 #include "APISecurityOrigin.h"
 #include "APIUIClient.h"
-#include "UserMediaProcessManager.h"
 #include "WebPageMessages.h"
 #include "WebPageProxy.h"
 #include "WebProcessProxy.h"
@@ -93,14 +92,8 @@
 UserMediaPermissionRequestManagerProxy::UserMediaPermissionRequestManagerProxy(WebPageProxy& page)
     : m_page(page)
 {
-    UserMediaProcessManager::singleton().addUserMediaPermissionRequestManagerProxy(*this);
 }
 
-UserMediaPermissionRequestManagerProxy::~UserMediaPermissionRequestManagerProxy()
-{
-    UserMediaProcessManager::singleton().removeUserMediaPermissionRequestManagerProxy(*this);
-}
-
 void UserMediaPermissionRequestManagerProxy::invalidateRequests()
 {
     for (auto& request : m_pendingUserMediaRequests.values())
@@ -204,8 +197,30 @@
     fameState.setHasPermissionToUseCaptureDevice(audioDeviceUID, true);
     fameState.setHasPermissionToUseCaptureDevice(videoDeviceUID, true);
 
-    UserMediaProcessManager::singleton().willCreateMediaStream(*this, !audioDeviceUID.isEmpty(), !videoDeviceUID.isEmpty());
+    size_t extensionCount = 0;
+    unsigned requiredExtensions = SandboxExtensionsGranted::None;
+    if (!audioDeviceUID.isEmpty()) {
+        requiredExtensions |= SandboxExtensionsGranted::Audio;
+        extensionCount++;
+    }
+    if (!videoDeviceUID.isEmpty()) {
+        requiredExtensions |= SandboxExtensionsGranted::Video;
+        extensionCount++;
+    }
 
+    unsigned currentExtensions = m_pageSandboxExtensionsGranted;
+    if (!(requiredExtensions & currentExtensions)) {
+        ASSERT(extensionCount);
+        m_pageSandboxExtensionsGranted = requiredExtensions | currentExtensions;
+        SandboxExtension::HandleArray handles;
+        handles.allocate(extensionCount);
+        if (!videoDeviceUID.isEmpty())
+            SandboxExtension::createHandleForGenericExtension("com.apple.webkit.camera", handles[--extensionCount]);
+        if (!audioDeviceUID.isEmpty())
+            SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone", handles[--extensionCount]);
+        m_page.process().send(Messages::WebPage::GrantUserMediaDevicesSandboxExtension(handles), m_page.pageID());
+    }
+
     m_page.process().send(Messages::WebPage::UserMediaAccessWasGranted(userMediaID, audioDeviceUID, videoDeviceUID), m_page.pageID());
 #else
     UNUSED_PARAM(userMediaID);
@@ -327,34 +342,4 @@
 #endif
 }
 
-void UserMediaPermissionRequestManagerProxy::stopCapture()
-{
-    if (!m_page.isValid())
-        return;
-
-#if ENABLE(MEDIA_STREAM)
-    m_page.setMuted(WebCore::MediaProducer::CaptureDevicesAreMuted);
-#endif
-}
-
-void UserMediaPermissionRequestManagerProxy::startedCaptureSession()
-{
-    if (!m_page.isValid())
-        return;
-
-#if ENABLE(MEDIA_STREAM)
-    UserMediaProcessManager::singleton().startedCaptureSession(*this);
-#endif
-}
-
-void UserMediaPermissionRequestManagerProxy::endedCaptureSession()
-{
-    if (!m_page.isValid())
-        return;
-
-#if ENABLE(MEDIA_STREAM)
-    UserMediaProcessManager::singleton().endedCaptureSession(*this);
-#endif
-}
-
 } // namespace WebKit

Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h (209448 => 209449)


--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h	2016-12-07 05:31:57 UTC (rev 209449)
@@ -53,10 +53,7 @@
 class UserMediaPermissionRequestManagerProxy {
 public:
     explicit UserMediaPermissionRequestManagerProxy(WebPageProxy&);
-    ~UserMediaPermissionRequestManagerProxy();
 
-    WebPageProxy& page() const { return m_page; }
-
     void invalidateRequests();
 
     void requestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, String userMediaDocumentOriginIdentifier, String topLevelDocumentOriginIdentifier, const WebCore::MediaConstraintsData& audioConstraintsData, const WebCore::MediaConstraintsData& videoConstraintsData);
@@ -71,10 +68,6 @@
 
     void clearCachedState();
 
-    void startedCaptureSession();
-    void endedCaptureSession();
-    void stopCapture();
-
 private:
     Ref<UserMediaPermissionRequestProxy> createRequest(uint64_t userMediaID, uint64_t frameID, const String&userMediaDocumentOriginIdentifier, const String& topLevelDocumentOriginIdentifier, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs);
     void denyRequest(uint64_t userMediaID, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason, const String& invalidConstraint);
@@ -83,6 +76,14 @@
 
     HashMap<uint64_t, RefPtr<UserMediaPermissionRequestProxy>> m_pendingUserMediaRequests;
     HashMap<uint64_t, RefPtr<UserMediaPermissionCheckProxy>> m_pendingDeviceRequests;
+
+    enum SandboxExtensionsGranted {
+        None = 0,
+        Video = 1 << 0,
+        Audio = 1 << 1
+    };
+    unsigned m_pageSandboxExtensionsGranted;
+
     HashMap<uint64_t, std::unique_ptr<FrameAuthorizationState>> m_frameStates;
 
     WebPageProxy& m_page;

Deleted: trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp (209448 => 209449)


--- trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp	2016-12-07 05:31:57 UTC (rev 209449)
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "config.h"
-#include "UserMediaProcessManager.h"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "MediaDeviceSandboxExtensions.h"
-#include "WebPageMessages.h"
-#include "WebPageProxy.h"
-#include "WebProcessProxy.h"
-#include <wtf/HashMap.h>
-#include <wtf/NeverDestroyed.h>
-
-namespace WebKit {
-
-static const char* const audioExtensionPath = "com.apple.webkit.microphone";
-static const char* const videoExtensionPath = "com.apple.webkit.camera";
-
-class ProcessState {
-public:
-    ProcessState() { }
-    ProcessState(const ProcessState&) = delete;
-
-    void addRequestManager(UserMediaPermissionRequestManagerProxy&);
-    void removeRequestManager(UserMediaPermissionRequestManagerProxy&);
-    Vector<UserMediaPermissionRequestManagerProxy*>& managers() { return m_managers; }
-
-    enum SandboxExtensionsGranted {
-        None = 0,
-        Video = 1 << 0,
-        Audio = 1 << 1
-    };
-
-    SandboxExtensionsGranted sandboxExtensionsGranted() { return m_pageSandboxExtensionsGranted; }
-    void setSandboxExtensionsGranted(unsigned granted) { m_pageSandboxExtensionsGranted = static_cast<SandboxExtensionsGranted>(granted); }
-
-private:
-    Vector<UserMediaPermissionRequestManagerProxy*> m_managers;
-    SandboxExtensionsGranted m_pageSandboxExtensionsGranted { SandboxExtensionsGranted::None };
-};
-
-static HashMap<WebProcessProxy*, std::unique_ptr<ProcessState>>& stateMap()
-{
-    static NeverDestroyed<HashMap<WebProcessProxy*, std::unique_ptr<ProcessState>>> map;
-    return map;
-}
-
-static ProcessState& processState(WebProcessProxy& process)
-{
-    auto& state = stateMap().add(&process, nullptr).iterator->value;
-    if (state)
-        return *state;
-
-    state = std::make_unique<ProcessState>();
-    return *state;
-}
-
-void ProcessState::addRequestManager(UserMediaPermissionRequestManagerProxy& proxy)
-{
-    ASSERT(!m_managers.contains(&proxy));
-    m_managers.append(&proxy);
-}
-
-void ProcessState::removeRequestManager(UserMediaPermissionRequestManagerProxy& proxy)
-{
-    ASSERT(m_managers.contains(&proxy));
-    m_managers.removeFirstMatching([&proxy](auto other) {
-        return other == &proxy;
-    });
-}
-
-UserMediaProcessManager& UserMediaProcessManager::singleton()
-{
-    static NeverDestroyed<UserMediaProcessManager> manager;
-    return manager;
-}
-
-void UserMediaProcessManager::addUserMediaPermissionRequestManagerProxy(UserMediaPermissionRequestManagerProxy& proxy)
-{
-    processState(proxy.page().process()).addRequestManager(proxy);
-}
-
-void UserMediaProcessManager::removeUserMediaPermissionRequestManagerProxy(UserMediaPermissionRequestManagerProxy& proxy)
-{
-    endedCaptureSession(proxy);
-
-    auto& state = processState(proxy.page().process());
-    state.removeRequestManager(proxy);
-    if (state.managers().isEmpty()) {
-        auto it = stateMap().find(&proxy.page().process());
-        stateMap().remove(it);
-    }
-}
-
-void UserMediaProcessManager::willCreateMediaStream(UserMediaPermissionRequestManagerProxy& proxy, bool withAudio, bool withVideo)
-{
-    ASSERT(stateMap().contains(&proxy.page().process()));
-
-    auto& state = processState(proxy.page().process());
-    size_t extensionCount = 0;
-    unsigned requiredExtensions = ProcessState::SandboxExtensionsGranted::None;
-
-    if (withAudio) {
-        requiredExtensions |= ProcessState::SandboxExtensionsGranted::Audio;
-        extensionCount++;
-    }
-    if (withVideo) {
-        requiredExtensions |= ProcessState::SandboxExtensionsGranted::Video;
-        extensionCount++;
-    }
-
-    unsigned currentExtensions = state.sandboxExtensionsGranted();
-    if (!(requiredExtensions & currentExtensions)) {
-        SandboxExtension::HandleArray handles;
-        handles.allocate(extensionCount);
-
-        Vector<String> ids;
-        ids.reserveCapacity(extensionCount);
-
-        if (withAudio && requiredExtensions & ProcessState::SandboxExtensionsGranted::Audio) {
-            if (SandboxExtension::createHandleForGenericExtension(audioExtensionPath, handles[--extensionCount])) {
-                ids.append(ASCIILiteral(audioExtensionPath));
-                currentExtensions |= ProcessState::SandboxExtensionsGranted::Audio;
-            }
-        }
-
-        if (withVideo && requiredExtensions & ProcessState::SandboxExtensionsGranted::Video) {
-            if (SandboxExtension::createHandleForGenericExtension(videoExtensionPath, handles[--extensionCount])) {
-                ids.append(ASCIILiteral(videoExtensionPath));
-                currentExtensions |= ProcessState::SandboxExtensionsGranted::Video;
-            }
-        }
-
-        state.setSandboxExtensionsGranted(currentExtensions);
-        proxy.page().process().send(Messages::WebPage::GrantUserMediaDeviceSandboxExtensions(MediaDeviceSandboxExtensions(ids, WTFMove(handles))), proxy.page().pageID());
-    }
-}
-
-void UserMediaProcessManager::startedCaptureSession(UserMediaPermissionRequestManagerProxy& proxy)
-{
-    ASSERT(stateMap().contains(&proxy.page().process()));
-}
-
-void UserMediaProcessManager::endedCaptureSession(UserMediaPermissionRequestManagerProxy& proxy)
-{
-    ASSERT(stateMap().contains(&proxy.page().process()));
-
-    auto& state = processState(proxy.page().process());
-    bool hasAudioCapture = false;
-    bool hasVideoCapture = false;
-    for (auto& manager : state.managers()) {
-        if (manager->page().hasActiveAudioStream())
-            hasAudioCapture = true;
-        if (manager->page().hasActiveVideoStream())
-            hasVideoCapture = true;
-    }
-
-    if (hasAudioCapture && hasVideoCapture)
-        return;
-
-    Vector<String> params;
-    unsigned currentExtensions = state.sandboxExtensionsGranted();
-    if (!hasAudioCapture && currentExtensions & ProcessState::SandboxExtensionsGranted::Audio) {
-        params.append(ASCIILiteral(audioExtensionPath));
-        currentExtensions &= ~ProcessState::SandboxExtensionsGranted::Audio;
-    }
-    if (!hasVideoCapture && currentExtensions & ProcessState::SandboxExtensionsGranted::Video) {
-        params.append(ASCIILiteral(videoExtensionPath));
-        currentExtensions &= ~ProcessState::SandboxExtensionsGranted::Video;
-    }
-
-    if (params.isEmpty())
-        return;
-
-    state.setSandboxExtensionsGranted(currentExtensions);
-    proxy.page().process().send(Messages::WebPage::RevokeUserMediaDeviceSandboxExtensions(params), proxy.page().pageID());
-}
-
-} // namespace WebKit
-
-#endif

Deleted: trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.h (209448 => 209449)


--- trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.h	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.h	2016-12-07 05:31:57 UTC (rev 209449)
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#pragma once
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "UserMediaPermissionRequestManagerProxy.h"
-
-namespace WebKit {
-
-class WebProcessProxy;
-
-class UserMediaProcessManager {
-public:
-
-    static UserMediaProcessManager& singleton();
-
-    void addUserMediaPermissionRequestManagerProxy(UserMediaPermissionRequestManagerProxy&);
-    void removeUserMediaPermissionRequestManagerProxy(UserMediaPermissionRequestManagerProxy&);
-
-    void willCreateMediaStream(UserMediaPermissionRequestManagerProxy&, bool withAudio, bool withVideo);
-
-    void startedCaptureSession(UserMediaPermissionRequestManagerProxy&);
-    void endedCaptureSession(UserMediaPermissionRequestManagerProxy&);
-};
-
-} // namespace WebKit
-
-#endif

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (209448 => 209449)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2016-12-07 05:31:57 UTC (rev 209449)
@@ -6409,21 +6409,15 @@
 
     WebCore::MediaProducer::MediaStateFlags oldMediaStateHasActiveCapture = m_mediaState & (WebCore::MediaProducer::HasActiveAudioCaptureDevice | WebCore::MediaProducer::HasActiveVideoCaptureDevice);
     WebCore::MediaProducer::MediaStateFlags newMediaStateHasActiveCapture = state & (WebCore::MediaProducer::HasActiveAudioCaptureDevice | WebCore::MediaProducer::HasActiveVideoCaptureDevice);
+    if (!oldMediaStateHasActiveCapture && newMediaStateHasActiveCapture)
+        m_uiClient->didBeginCaptureSession();
+    if (oldMediaStateHasActiveCapture && !newMediaStateHasActiveCapture)
+        m_uiClient->didEndCaptureSession();
 
     MediaProducer::MediaStateFlags playingMediaMask = MediaProducer::IsPlayingAudio | MediaProducer::IsPlayingVideo;
     MediaProducer::MediaStateFlags oldState = m_mediaState;
     m_mediaState = state;
 
-#if ENABLE(MEDIA_STREAM)
-    if (!oldMediaStateHasActiveCapture && newMediaStateHasActiveCapture) {
-        m_uiClient->didBeginCaptureSession();
-        m_userMediaPermissionRequestManager.startedCaptureSession();
-    } else if (oldMediaStateHasActiveCapture && !newMediaStateHasActiveCapture) {
-        m_uiClient->didEndCaptureSession();
-        m_userMediaPermissionRequestManager.endedCaptureSession();
-    }
-#endif
-
     activityStateDidChange(ActivityState::IsAudible);
 
     playingMediaMask |= MediaProducer::HasActiveAudioCaptureDevice | MediaProducer::HasActiveVideoCaptureDevice;

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (209448 => 209449)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2016-12-07 05:31:57 UTC (rev 209449)
@@ -1049,8 +1049,6 @@
 
     bool isPlayingAudio() const { return !!(m_mediaState & WebCore::MediaProducer::IsPlayingAudio); }
     void isPlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags, uint64_t);
-    bool hasActiveAudioStream() const { return m_mediaState & WebCore::MediaProducer::HasActiveAudioCaptureDevice; }
-    bool hasActiveVideoStream() const { return m_mediaState & WebCore::MediaProducer::HasActiveVideoCaptureDevice; }
     WebCore::MediaProducer::MediaStateFlags mediaStateFlags() const { return m_mediaState; }
 
 #if PLATFORM(MAC)

Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (209448 => 209449)


--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2016-12-07 05:31:57 UTC (rev 209449)
@@ -58,9 +58,6 @@
 		07297F9F1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 07297F9D1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h */; };
 		07297FA21C186ADB003F0735 /* WKUserMediaPermissionCheck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07297FA01C186ADB003F0735 /* WKUserMediaPermissionCheck.cpp */; };
 		07297FA31C186ADB003F0735 /* WKUserMediaPermissionCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 07297FA11C186ADB003F0735 /* WKUserMediaPermissionCheck.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		074E75FD1DF2211500D318EC /* UserMediaProcessManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 074E75FC1DF2002400D318EC /* UserMediaProcessManager.cpp */; };
-		074E75FE1DF2211900D318EC /* UserMediaProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 074E75FB1DF1FD1300D318EC /* UserMediaProcessManager.h */; };
-		074E76021DF707BE00D318EC /* MediaDeviceSandboxExtensions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 074E76001DF7075D00D318EC /* MediaDeviceSandboxExtensions.cpp */; };
 		076E884E1A13CADF005E90FC /* APIContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 076E884D1A13CADF005E90FC /* APIContextMenuClient.h */; };
 		07A5EBBB1C7BA43E00B9CA69 /* WKFrameHandleRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07A5EBB91C7BA43E00B9CA69 /* WKFrameHandleRef.cpp */; };
 		07A5EBBC1C7BA43E00B9CA69 /* WKFrameHandleRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 07A5EBBA1C7BA43E00B9CA69 /* WKFrameHandleRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2064,10 +2061,6 @@
 		07297F9D1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMediaPermissionCheckProxy.h; sourceTree = "<group>"; };
 		07297FA01C186ADB003F0735 /* WKUserMediaPermissionCheck.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserMediaPermissionCheck.cpp; sourceTree = "<group>"; };
 		07297FA11C186ADB003F0735 /* WKUserMediaPermissionCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserMediaPermissionCheck.h; sourceTree = "<group>"; };
-		074E75FB1DF1FD1300D318EC /* UserMediaProcessManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMediaProcessManager.h; sourceTree = "<group>"; };
-		074E75FC1DF2002400D318EC /* UserMediaProcessManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserMediaProcessManager.cpp; sourceTree = "<group>"; };
-		074E76001DF7075D00D318EC /* MediaDeviceSandboxExtensions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaDeviceSandboxExtensions.cpp; sourceTree = "<group>"; };
-		074E76011DF7075D00D318EC /* MediaDeviceSandboxExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaDeviceSandboxExtensions.h; sourceTree = "<group>"; };
 		076E884D1A13CADF005E90FC /* APIContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIContextMenuClient.h; sourceTree = "<group>"; };
 		076E884F1A13CBC6005E90FC /* APIInjectedBundlePageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIInjectedBundlePageContextMenuClient.h; sourceTree = "<group>"; };
 		07A5EBB91C7BA43E00B9CA69 /* WKFrameHandleRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKFrameHandleRef.cpp; sourceTree = "<group>"; };
@@ -5483,8 +5476,6 @@
 		4A410F4119AF7B27002EBAB5 /* MediaStream */ = {
 			isa = PBXGroup;
 			children = (
-				074E76001DF7075D00D318EC /* MediaDeviceSandboxExtensions.cpp */,
-				074E76011DF7075D00D318EC /* MediaDeviceSandboxExtensions.h */,
 				4A410F4219AF7B27002EBAB5 /* UserMediaPermissionRequestManager.cpp */,
 				4A410F4319AF7B27002EBAB5 /* UserMediaPermissionRequestManager.h */,
 			);
@@ -6165,8 +6156,6 @@
 		BC032DC310F438260058C15A /* UIProcess */ = {
 			isa = PBXGroup;
 			children = (
-				074E75FC1DF2002400D318EC /* UserMediaProcessManager.cpp */,
-				074E75FB1DF1FD1300D318EC /* UserMediaProcessManager.h */,
 				BC032DC410F4387C0058C15A /* API */,
 				1AB1F7761D1B30A9007C9BD1 /* ApplePay */,
 				512F588D12A8836F00629530 /* Authentication */,
@@ -8311,7 +8300,6 @@
 				532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */,
 				0FCB4E4F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h in Headers */,
 				BCC8B374125FB69000DE46A4 /* WKGeometry.h in Headers */,
-				074E75FE1DF2211900D318EC /* UserMediaProcessManager.h in Headers */,
 				1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */,
 				B62E7312143047B00069EC35 /* WKHitTestResult.h in Headers */,
 				5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */,
@@ -9375,7 +9363,6 @@
 				0F5E200318E77051003EC3E5 /* PlatformCAAnimationRemote.mm in Sources */,
 				2DA049B3180CCCD300AAFA9E /* PlatformCALayerRemote.cpp in Sources */,
 				2D8710161828415D0018FA01 /* PlatformCALayerRemoteCustom.mm in Sources */,
-				074E75FD1DF2211500D318EC /* UserMediaProcessManager.cpp in Sources */,
 				2D8949F0182044F600E898AA /* PlatformCALayerRemoteTiledBacking.cpp in Sources */,
 				BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */,
 				1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */,
@@ -9840,7 +9827,6 @@
 				1A256E3718A1A788006FB922 /* WKNavigationAction.mm in Sources */,
 				2D3A65DA1A7C3A1F00CAC637 /* WKNavigationActionRef.cpp in Sources */,
 				370F34A21829BE1E009027C8 /* WKNavigationData.mm in Sources */,
-				074E76021DF707BE00D318EC /* MediaDeviceSandboxExtensions.cpp in Sources */,
 				BCF69FAA1176D1CB00471A52 /* WKNavigationDataRef.cpp in Sources */,
 				2D3A65E21A7C3A9300CAC637 /* WKNavigationRef.cpp in Sources */,
 				1A1B0EB518A424950038481A /* WKNavigationResponse.mm in Sources */,

Deleted: trunk/Source/WebKit2/WebProcess/MediaStream/MediaDeviceSandboxExtensions.cpp (209448 => 209449)


--- trunk/Source/WebKit2/WebProcess/MediaStream/MediaDeviceSandboxExtensions.cpp	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/MediaDeviceSandboxExtensions.cpp	2016-12-07 05:31:57 UTC (rev 209449)
@@ -1,80 +0,0 @@
-/*
- * 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
- * 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. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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.
- */
-
-#include "config.h"
-#include "MediaDeviceSandboxExtensions.h"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "WebCoreArgumentCoders.h"
-
-namespace WebKit {
-
-MediaDeviceSandboxExtensions::MediaDeviceSandboxExtensions(Vector<String> ids, SandboxExtension::HandleArray&& handles)
-    : m_ids(ids)
-    , m_handles(WTFMove(handles))
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(m_ids.size() == m_handles.size());
-}
-
-void MediaDeviceSandboxExtensions::encode(IPC::Encoder& encoder) const
-{
-    encoder << m_ids;
-    m_handles.encode(encoder);
-}
-
-bool MediaDeviceSandboxExtensions::decode(IPC::Decoder& decoder, MediaDeviceSandboxExtensions& result)
-{
-    if (!decoder.decode(result.m_ids))
-        return false;
-
-    if (!SandboxExtension::HandleArray::decode(decoder, result.m_handles))
-        return false;
-
-    return true;
-}
-
-std::pair<String, RefPtr<SandboxExtension>> MediaDeviceSandboxExtensions::operator[](size_t i)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(m_ids.size() == m_handles.size());
-    ASSERT_WITH_SECURITY_IMPLICATION(i < m_ids.size());
-    return { m_ids[i], SandboxExtension::create(m_handles[i]) };
-}
-
-const std::pair<String, RefPtr<SandboxExtension>> MediaDeviceSandboxExtensions::operator[](size_t i) const
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(m_ids.size() == m_handles.size());
-    ASSERT_WITH_SECURITY_IMPLICATION(i < m_ids.size());
-    return { m_ids[i], SandboxExtension::create(m_handles[i]) };
-}
-
-size_t MediaDeviceSandboxExtensions::size() const
-{
-    return m_ids.size();
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(MEDIA_STREAM)

Deleted: trunk/Source/WebKit2/WebProcess/MediaStream/MediaDeviceSandboxExtensions.h (209448 => 209449)


--- trunk/Source/WebKit2/WebProcess/MediaStream/MediaDeviceSandboxExtensions.h	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/MediaDeviceSandboxExtensions.h	2016-12-07 05:31:57 UTC (rev 209449)
@@ -1,59 +0,0 @@
-/*
- * 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
- * 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. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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.
- */
-
-#pragma once
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "SandboxExtension.h"
-#include <wtf/Noncopyable.h>
-#include <wtf/RefPtr.h>
-
-namespace WebKit {
-
-class MediaDeviceSandboxExtensions {
-    WTF_MAKE_NONCOPYABLE(MediaDeviceSandboxExtensions);
-public:
-    MediaDeviceSandboxExtensions()
-    {
-    }
-
-    MediaDeviceSandboxExtensions(Vector<String> ids, SandboxExtension::HandleArray&& handles);
-
-    std::pair<String, RefPtr<SandboxExtension>> operator[](size_t i);
-    const std::pair<String, RefPtr<SandboxExtension>> operator[](size_t i) const;
-    size_t size() const;
-
-    void encode(IPC::Encoder&) const;
-    static bool decode(IPC::Decoder&, MediaDeviceSandboxExtensions&);
-
-private:
-    Vector<String> m_ids;
-    SandboxExtension::HandleArray m_handles;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(MEDIA_STREAM)

Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp (209448 => 209449)


--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp	2016-12-07 05:31:57 UTC (rev 209449)
@@ -52,7 +52,7 @@
 UserMediaPermissionRequestManager::~UserMediaPermissionRequestManager()
 {
     for (auto& sandboxExtension : m_userMediaDeviceSandboxExtensions)
-        sandboxExtension.value->revoke();
+        sandboxExtension->revoke();
 }
 
 void UserMediaPermissionRequestManager::startUserMediaRequest(UserMediaRequest& request)
@@ -202,21 +202,15 @@
     request->setDeviceInfo(deviceList, mediaDeviceIdentifierHashSalt, hasPersistentAccess);
 }
 
-void UserMediaPermissionRequestManager::grantUserMediaDeviceSandboxExtensions(const MediaDeviceSandboxExtensions& extensions)
+void UserMediaPermissionRequestManager::grantUserMediaDevicesSandboxExtension(const SandboxExtension::HandleArray& sandboxExtensionHandles)
 {
-    for (size_t i = 0; i < extensions.size(); i++) {
-        auto& extension = extensions[i];
-        extension.second->consume();
-        m_userMediaDeviceSandboxExtensions.add(extension.first, extension.second.copyRef());
-    }
-}
+    ASSERT(m_userMediaDeviceSandboxExtensions.size() <= 2);
 
-void UserMediaPermissionRequestManager::revokeUserMediaDeviceSandboxExtensions(const Vector<String>& extensionIDs)
-{
-    for (const auto& extensionID : extensionIDs) {
-        auto extension = m_userMediaDeviceSandboxExtensions.take(extensionID);
-        if (extension)
-            extension->revoke();
+    for (size_t i = 0; i < sandboxExtensionHandles.size(); i++) {
+        if (auto extension = SandboxExtension::create(sandboxExtensionHandles[i])) {
+            extension->consume();
+            m_userMediaDeviceSandboxExtensions.append(extension.release());
+        }
     }
 }
 

Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h (209448 => 209449)


--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h	2016-12-07 05:31:57 UTC (rev 209449)
@@ -22,7 +22,6 @@
 
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaDeviceSandboxExtensions.h"
 #include "SandboxExtension.h"
 #include <WebCore/MediaCanStartListener.h>
 #include <WebCore/MediaConstraints.h>
@@ -52,8 +51,7 @@
     void cancelMediaDevicesEnumeration(WebCore::MediaDevicesEnumerationRequest&);
     void didCompleteMediaDeviceEnumeration(uint64_t, const Vector<WebCore::CaptureDevice>& deviceList, const String& deviceIdentifierHashSalt, bool originHasPersistentAccess);
 
-    void grantUserMediaDeviceSandboxExtensions(const MediaDeviceSandboxExtensions&);
-    void revokeUserMediaDeviceSandboxExtensions(const Vector<String>&);
+    void grantUserMediaDevicesSandboxExtension(const SandboxExtension::HandleArray&);
 
 private:
     void sendUserMediaRequest(WebCore::UserMediaRequest&);
@@ -71,7 +69,7 @@
     HashMap<uint64_t, RefPtr<WebCore::MediaDevicesEnumerationRequest>> m_idToMediaDevicesEnumerationRequestMap;
     HashMap<RefPtr<WebCore::MediaDevicesEnumerationRequest>, uint64_t> m_mediaDevicesEnumerationRequestToIDMap;
 
-    HashMap<String, RefPtr<SandboxExtension>> m_userMediaDeviceSandboxExtensions;
+    Vector<RefPtr<SandboxExtension>> m_userMediaDeviceSandboxExtensions;
 
     HashMap<RefPtr<WebCore::Document>, Vector<RefPtr<WebCore::UserMediaRequest>>> m_blockedRequests;
 };

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (209448 => 209449)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2016-12-07 05:31:57 UTC (rev 209449)
@@ -3700,15 +3700,10 @@
     m_userMediaPermissionRequestManager.didCompleteMediaDeviceEnumeration(userMediaID, devices, deviceIdentifierHashSalt, originHasPersistentAccess);
 }
 
-void WebPage::grantUserMediaDeviceSandboxExtensions(const MediaDeviceSandboxExtensions& extensions)
+void WebPage::grantUserMediaDevicesSandboxExtension(const SandboxExtension::HandleArray& handles)
 {
-    m_userMediaPermissionRequestManager.grantUserMediaDeviceSandboxExtensions(extensions);
+    m_userMediaPermissionRequestManager.grantUserMediaDevicesSandboxExtension(handles);
 }
-
-void WebPage::revokeUserMediaDeviceSandboxExtensions(const Vector<String>& extensionIDs)
-{
-    m_userMediaPermissionRequestManager.revokeUserMediaDeviceSandboxExtensions(extensionIDs);
-}
 #endif
 
 #if !PLATFORM(IOS)

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (209448 => 209449)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h	2016-12-07 05:31:57 UTC (rev 209449)
@@ -1178,8 +1178,7 @@
     void userMediaAccessWasDenied(uint64_t userMediaID, uint64_t reason, String invalidConstraint);
 
     void didCompleteMediaDeviceEnumeration(uint64_t userMediaID, const Vector<WebCore::CaptureDevice>& devices, const String& deviceIdentifierHashSalt, bool originHasPersistentAccess);
-    void grantUserMediaDeviceSandboxExtensions(const MediaDeviceSandboxExtensions&);
-    void revokeUserMediaDeviceSandboxExtensions(const Vector<String>&);
+    void grantUserMediaDevicesSandboxExtension(const SandboxExtension::HandleArray&);
 #endif
 
     void advanceToNextMisspelling(bool startBeforeSelection);

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (209448 => 209449)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in	2016-12-07 05:18:56 UTC (rev 209448)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in	2016-12-07 05:31:57 UTC (rev 209449)
@@ -292,8 +292,7 @@
     UserMediaAccessWasGranted(uint64_t userMediaID, String audioDeviceUID, String videoDeviceUID)
     UserMediaAccessWasDenied(uint64_t userMediaID, uint64_t reason, String invalidConstraint)
     DidCompleteMediaDeviceEnumeration(uint64_t userMediaID, Vector<WebCore::CaptureDevice> devices, String mediaDeviceIdentifierHashSalt, bool hasPersistentAccess)
-    GrantUserMediaDeviceSandboxExtensions(WebKit::MediaDeviceSandboxExtensions sandboxExtensions)
-    RevokeUserMediaDeviceSandboxExtensions(Vector<String> sandboxExtensionIDs)
+    GrantUserMediaDevicesSandboxExtension(WebKit::SandboxExtension::HandleArray sandboxExtensionHandle)
 #endif
 
     # Notification
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to