Diff
Modified: trunk/Source/WebCore/ChangeLog (281359 => 281360)
--- trunk/Source/WebCore/ChangeLog 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebCore/ChangeLog 2021-08-21 02:56:54 UTC (rev 281360)
@@ -1,3 +1,16 @@
+2021-08-20 Simon Fraser <simon.fra...@apple.com>
+
+ Use UserMediaRequestIdentifier in WebKit rather than a mysterious uint64_t
+ https://bugs.webkit.org/show_bug.cgi?id=229308
+
+ Reviewed by Youenn Fablet.
+
+ Move UserMediaRequestIdentifier to its own header.
+
+ * Headers.cmake:
+ * Modules/mediastream/UserMediaRequest.h:
+ * WebCore.xcodeproj/project.pbxproj:
+
2021-08-20 Alan Bujtas <za...@apple.com>
[LFC][Integration] Initialize root box's border and padding values
Modified: trunk/Source/WebCore/Headers.cmake (281359 => 281360)
--- trunk/Source/WebCore/Headers.cmake 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebCore/Headers.cmake 2021-08-21 02:56:54 UTC (rev 281360)
@@ -962,6 +962,7 @@
page/UserContentTypes.h
page/UserContentURLPattern.h
page/UserInterfaceDirectionPolicy.h
+ page/UserMediaRequestIdentifier.h
page/UserMessageHandler.h
page/UserMessageHandlerDescriptor.h
page/UserMessageHandlersNamespace.h
Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (281359 => 281360)
--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2021-08-21 02:56:54 UTC (rev 281360)
@@ -40,6 +40,7 @@
#include "MediaConstraints.h"
#include "MediaStreamPrivate.h"
#include "MediaStreamRequest.h"
+#include "UserMediaRequestIdentifier.h"
#include <wtf/CompletionHandler.h>
#include <wtf/ObjectIdentifier.h>
#include <wtf/UniqueRef.h>
@@ -51,9 +52,6 @@
template<typename IDLType> class DOMPromiseDeferred;
-enum UserMediaRequestIdentifierType { };
-using UserMediaRequestIdentifier = ObjectIdentifier<UserMediaRequestIdentifierType>;
-
class UserMediaRequest : public RefCounted<UserMediaRequest>, public ActiveDOMObject {
public:
static Ref<UserMediaRequest> create(Document&, MediaStreamRequest&&, DOMPromiseDeferred<IDLInterface<MediaStream>>&&);
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (281359 => 281360)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-08-21 02:56:54 UTC (rev 281360)
@@ -338,6 +338,7 @@
0F6A12BE1A00923700C6DE72 /* DebugPageOverlays.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6A12BC1A00923700C6DE72 /* DebugPageOverlays.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F6B707A237BC36D0052CA47 /* CSSUnits.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6B7077237BC12F0052CA47 /* CSSUnits.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F73B769222B3A0C00805316 /* ScrollingTreeOverflowScrollingNodeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC0516A219B5EBE0031C39E /* ScrollingTreeOverflowScrollingNodeMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 0F768C2D26D03841008DBE0B /* UserMediaRequestIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F768C2B26D03841008DBE0B /* UserMediaRequestIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F790F432517CE6E009BA034 /* DisplayView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F790F3F2517CE6D009BA034 /* DisplayView.h */; };
0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F850FE31ED7C18300FB77A7 /* PerformanceLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F850FE21ED7C18300FB77A7 /* PerformanceLoggingClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -6230,6 +6231,7 @@
0F70495D211B524200369968 /* ActivityState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ActivityState.cpp; sourceTree = "<group>"; };
0F736ECA26CCB97A000AD7CA /* LayerTreeAsTextOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LayerTreeAsTextOptions.h; sourceTree = "<group>"; };
0F73B765222B327F00805316 /* ScrollingStateScrollingNodeMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingStateScrollingNodeMac.mm; sourceTree = "<group>"; };
+ 0F768C2B26D03841008DBE0B /* UserMediaRequestIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMediaRequestIdentifier.h; sourceTree = "<group>"; };
0F790F3D2517CE6D009BA034 /* DisplayView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayView.cpp; sourceTree = "<group>"; };
0F790F3F2517CE6D009BA034 /* DisplayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayView.h; sourceTree = "<group>"; };
0F7DF1471E2BF1A60095951B /* WebCoreJSClientData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreJSClientData.cpp; sourceTree = "<group>"; };
@@ -22185,6 +22187,7 @@
BCACF3BA1072921A00C0C8A3 /* UserContentURLPattern.cpp */,
BCACF3BB1072921A00C0C8A3 /* UserContentURLPattern.h */,
BC4A5326256055D30028C592 /* UserInterfaceDirectionPolicy.h */,
+ 0F768C2B26D03841008DBE0B /* UserMediaRequestIdentifier.h */,
7C3B796F1908757B00B47A2D /* UserMessageHandler.cpp */,
7C3B79701908757B00B47A2D /* UserMessageHandler.h */,
7C73FB0E191EF60E007DE061 /* UserMessageHandler.idl */,
@@ -33522,7 +33525,6 @@
7AE6C93C1BE0C60100E19E03 /* MainThreadSharedTimer.h in Headers */,
E451C6322394031A00993190 /* MarginTypes.h in Headers */,
CE1866451F72E5B400A0CAB6 /* MarkedText.h in Headers */,
- E440FD5325A4AFDF00F7C849 /* StyledMarkedText.h in Headers */,
93309DF8099E64920056E581 /* markup.h in Headers */,
9728C3141268E4390041E89B /* MarkupAccumulator.h in Headers */,
00C60E3F13D76D7E0092A275 /* MarkupTokenizerInlines.h in Headers */,
@@ -34694,6 +34696,7 @@
BC779E171BB227CA00CAA8BF /* StyleCustomPropertyData.h in Headers */,
A8C4A7FD09D563270003AC8D /* StyledElement.h in Headers */,
BC5EB8B90E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h in Headers */,
+ E440FD5325A4AFDF00F7C849 /* StyledMarkedText.h in Headers */,
319AE064142D6B24006563A1 /* StyleFilterData.h in Headers */,
5317612313C516690026E454 /* StyleFlexibleBoxData.h in Headers */,
E4D58EB917B4ED8900CBDCA8 /* StyleFontSizeFunctions.h in Headers */,
@@ -35117,6 +35120,7 @@
078E092E17D14D1C00420AA1 /* UserMediaClient.h in Headers */,
078E092F17D14D1C00420AA1 /* UserMediaController.h in Headers */,
078E093017D14D1C00420AA1 /* UserMediaRequest.h in Headers */,
+ 0F768C2D26D03841008DBE0B /* UserMediaRequestIdentifier.h in Headers */,
7C3B79721908757B00B47A2D /* UserMessageHandler.h in Headers */,
7CE68345192143A800F4D928 /* UserMessageHandlerDescriptor.h in Headers */,
7CE683471921821500F4D928 /* UserMessageHandlerDescriptorTypes.h in Headers */,
Added: trunk/Source/WebCore/page/UserMediaRequestIdentifier.h (0 => 281360)
--- trunk/Source/WebCore/page/UserMediaRequestIdentifier.h (rev 0)
+++ trunk/Source/WebCore/page/UserMediaRequestIdentifier.h 2021-08-21 02:56:54 UTC (rev 281360)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 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.
+ * 3. Neither the name of Ericsson nor the names of its contributors
+ * may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER 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.
+ */
+
+#pragma once
+
+#include <wtf/ObjectIdentifier.h>
+
+namespace WebCore {
+
+enum UserMediaRequestIdentifierType { };
+using UserMediaRequestIdentifier = ObjectIdentifier<UserMediaRequestIdentifierType>;
+
+} // namespace WebCore
Modified: trunk/Source/WebKit/ChangeLog (281359 => 281360)
--- trunk/Source/WebKit/ChangeLog 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/ChangeLog 2021-08-21 02:56:54 UTC (rev 281360)
@@ -1,3 +1,54 @@
+2021-08-20 Simon Fraser <simon.fra...@apple.com>
+
+ Use UserMediaRequestIdentifier in WebKit rather than a mysterious uint64_t
+ https://bugs.webkit.org/show_bug.cgi?id=229308
+
+ Reviewed by Youenn Fablet.
+
+ Use the existing WebCore::UserMediaRequestIdentifier in WebKit code. We need to pull
+ it out of the ENABLE(MEDIA_STREAM) #ifdef.
+
+ In UserMediaPermissionRequestManagerProxy use a new identifier type, MediaDevicePermissionRequestIdentifier,
+ which is used to identify pending permission requests (but never send to the web process).
+
+ * Scripts/webkit/messages.py:
+ (types_that_cannot_be_forward_declared): Sort
+ (headers_for_type):
+ * UIProcess/MediaKeySystemPermissionRequestManagerProxy.h:
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::denyRequest):
+ (WebKit::UserMediaPermissionRequestManagerProxy::grantRequest):
+ (WebKit::UserMediaPermissionRequestManagerProxy::finishGrantingRequest):
+ (WebKit::UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame):
+ (WebKit::UserMediaPermissionRequestManagerProxy::processUserMediaPermissionRequest):
+ (WebKit::UserMediaPermissionRequestManagerProxy::processUserMediaPermissionInvalidRequest):
+ (WebKit::UserMediaPermissionRequestManagerProxy::processUserMediaPermissionValidRequest):
+ (WebKit::UserMediaPermissionRequestManagerProxy::checkUserMediaPermissionForSpeechRecognition):
+ (WebKit::UserMediaPermissionRequestManagerProxy::getUserMediaPermissionInfo):
+ (WebKit::UserMediaPermissionRequestManagerProxy::enumerateMediaDevicesForFrame):
+ (WebKit::generateRequestID): Deleted.
+ * UIProcess/UserMediaPermissionRequestManagerProxy.h:
+ * UIProcess/UserMediaPermissionRequestProxy.cpp:
+ (WebKit::UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy):
+ * UIProcess/UserMediaPermissionRequestProxy.h:
+ (WebKit::UserMediaPermissionRequestProxy::create):
+ (WebKit::UserMediaPermissionRequestProxy::userMediaID const):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::requestUserMediaPermissionForFrame):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebKit.xcodeproj/project.pbxproj: Some files that were in Sources.txt were missing from the project.
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
+ (WebKit::UserMediaPermissionRequestManager::sendUserMediaRequest):
+ (WebKit::UserMediaPermissionRequestManager::userMediaAccessWasGranted):
+ (WebKit::UserMediaPermissionRequestManager::userMediaAccessWasDenied):
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::userMediaAccessWasGranted):
+ (WebKit::WebPage::userMediaAccessWasDenied):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2021-08-20 Aditya Keerthi <akeer...@apple.com>
[macCatalyst] Crash when clicking a phone number link
Modified: trunk/Source/WebKit/Scripts/webkit/messages.py (281359 => 281360)
--- trunk/Source/WebKit/Scripts/webkit/messages.py 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/Scripts/webkit/messages.py 2021-08-21 02:56:54 UTC (rev 281360)
@@ -277,25 +277,26 @@
'WebCore::DictationContext',
'WebCore::DisplayList::FlushIdentifier',
'WebCore::DisplayList::ItemBufferIdentifier',
- 'WebCore::DragApplicationFlags',
'WebCore::DocumentIdentifier',
'WebCore::DocumentOrWorkerIdentifier',
+ 'WebCore::DragApplicationFlags',
'WebCore::FetchIdentifier',
'WebCore::FrameIdentifier',
'WebCore::GraphicsContextGLAttributes',
'WebCore::ImageDecoderIdentifier',
'WebCore::LibWebRTCSocketIdentifier',
- 'WebCore::PlaybackTargetClientContextIdentifier',
'WebCore::MediaPlayerIdentifier',
'WebCore::MediaSessionIdentifier',
'WebCore::NativeImageReference',
'WebCore::PageIdentifier',
+ 'WebCore::PlaybackTargetClientContextIdentifier',
'WebCore::PluginLoadClientPolicy',
'WebCore::PointerID',
'WebCore::ProcessIdentifier',
'WebCore::RealtimeMediaSourceIdentifier',
+ 'WebCore::RenderingMode',
'WebCore::RenderingResourceIdentifier',
- 'WebCore::RenderingMode',
+ 'WebCore::SWServerConnectionIdentifier',
'WebCore::ServiceWorkerIdentifier',
'WebCore::ServiceWorkerJobIdentifier',
'WebCore::ServiceWorkerOrClientData',
@@ -305,7 +306,7 @@
'WebCore::SleepDisablerIdentifier',
'WebCore::SourceBufferAppendMode',
'WebCore::SpeechRecognitionConnectionClientIdentifier',
- 'WebCore::SWServerConnectionIdentifier',
+ 'WebCore::UserMediaRequestIdentifier',
'WebCore::WebSocketIdentifier',
'WebKit::ActivityStateChangeID',
'WebKit::AudioMediaStreamTrackRendererInternalUnitIdentifier',
@@ -322,6 +323,8 @@
'WebKit::MediaRecorderIdentifier',
'WebKit::PDFPluginIdentifier',
'WebKit::PlaybackSessionContextIdentifier',
+ 'WebKit::RTCDecoderIdentifier',
+ 'WebKit::RTCEncoderIdentifier',
'WebKit::RemoteAudioDestinationIdentifier',
'WebKit::RemoteAudioHardwareListenerIdentifier',
'WebKit::RemoteAudioSessionIdentifier',
@@ -334,10 +337,8 @@
'WebKit::RemoteMediaSourceIdentifier',
'WebKit::RemoteRemoteCommandListenerIdentifier',
'WebKit::RemoteSourceBufferIdentifier',
+ 'WebKit::RenderingBackendIdentifier',
'WebKit::RenderingUpdateID',
- 'WebKit::RenderingBackendIdentifier',
- 'WebKit::RTCDecoderIdentifier',
- 'WebKit::RTCEncoderIdentifier',
'WebKit::SampleBufferDisplayLayerIdentifier',
'WebKit::StorageAreaIdentifier',
'WebKit::StorageAreaImplIdentifier',
@@ -691,17 +692,18 @@
'WebCore::DragHandlingMethod': ['<WebCore/DragActions.h>'],
'WebCore::DragOperation': ['<WebCore/DragActions.h>'],
'WebCore::DragSourceAction': ['<WebCore/DragActions.h>'],
+ 'WebCore::EventMakesGamepadsVisible': ['<WebCore/GamepadProviderClient.h>'],
'WebCore::ExceptionDetails': ['<WebCore/JSDOMExceptionHandling.h>'],
'WebCore::FileChooserSettings': ['<WebCore/FileChooser.h>'],
- 'WebCore::ShareDataWithParsedURL': ['<WebCore/ShareData.h>'],
+ 'WebCore::FirstPartyWebsiteDataRemovalMode': ['<WebCore/NetworkStorageSession.h>'],
'WebCore::FontChanges': ['<WebCore/FontAttributeChanges.h>'],
'WebCore::FrameLoadType': ['<WebCore/FrameLoaderTypes.h>'],
- 'WebCore::EventMakesGamepadsVisible': ['<WebCore/GamepadProviderClient.h>'],
'WebCore::GenericCueData': ['<WebCore/InbandGenericCue.h>'],
'WebCore::GrammarDetail': ['<WebCore/TextCheckerClient.h>'],
'WebCore::HasInsecureContent': ['<WebCore/FrameLoaderTypes.h>'],
'WebCore::HighlightRequestOriginatedInApp': ['<WebCore/AppHighlight.h>'],
'WebCore::HighlightVisibility': ['<WebCore/HighlightVisibility.h>'],
+ 'WebCore::ISOWebVTTCue': ['<WebCore/ISOVTTCue.h>'],
'WebCore::IncludeSecureCookies': ['<WebCore/CookieJar.h>'],
'WebCore::IndexedDB::ObjectStoreOverwriteMode': ['<WebCore/IndexedDB.h>'],
'WebCore::InputMode': ['<WebCore/InputMode.h>'],
@@ -711,6 +713,7 @@
'WebCore::LastNavigationWasAppInitiated': ['<WebCore/ServiceWorkerClientData.h>'],
'WebCore::LegacyCDMSessionClient::MediaKeyErrorCode': ['<WebCore/LegacyCDMSession.h>'],
'WebCore::LockBackForwardList': ['<WebCore/FrameLoaderTypes.h>'],
+ 'WebCore::MediaEngineSupportParameters': ['<WebCore/MediaPlayer.h>'],
'WebCore::MessagePortChannelProvider::HasActivity': ['<WebCore/MessagePortChannelProvider.h>'],
'WebCore::MouseEventPolicy': ['<WebCore/DocumentLoader.h>'],
'WebCore::NetworkTransactionInformation': ['<WebCore/NetworkLoadInformation.h>'],
@@ -725,15 +728,16 @@
'WebCore::PluginInfo': ['<WebCore/PluginData.h>'],
'WebCore::PluginLoadClientPolicy': ['<WebCore/PluginData.h>'],
'WebCore::PolicyAction': ['<WebCore/FrameLoaderTypes.h>'],
+ 'WebCore::PolicyCheckIdentifier': ['<WebCore/FrameLoaderTypes.h>'],
'WebCore::PreserveResolution': ['<WebCore/ImageBufferBackend.h>'],
- 'WebCore::ShouldContinuePolicyCheck': ['<WebCore/FrameLoaderTypes.h>'],
- 'WebCore::PolicyCheckIdentifier': ['<WebCore/FrameLoaderTypes.h>'],
'WebCore::ProcessIdentifier': ['<WebCore/ProcessIdentifier.h>'],
'WebCore::RecentSearch': ['<WebCore/SearchPopupMenu.h>'],
'WebCore::RequestStorageAccessResult': ['<WebCore/DocumentStorageAccess.h>'],
'WebCore::RouteSharingPolicy': ['<WebCore/AudioSession.h>'],
'WebCore::SWServerConnectionIdentifier': ['<WebCore/ServiceWorkerTypes.h>'],
+ 'WebCore::SameSiteStrictEnforcementEnabled': ['<WebCore/NetworkStorageSession.h>'],
'WebCore::SelectionDirection': ['<WebCore/VisibleSelection.h>'],
+ 'WebCore::SelectionGeometry': ['"EditorState.h"'],
'WebCore::ServiceWorkerJobIdentifier': ['<WebCore/ServiceWorkerTypes.h>'],
'WebCore::ServiceWorkerOrClientData': ['<WebCore/ServiceWorkerTypes.h>', '<WebCore/ServiceWorkerClientData.h>', '<WebCore/ServiceWorkerData.h>'],
'WebCore::ServiceWorkerOrClientIdentifier': ['<WebCore/ServiceWorkerTypes.h>', '<WebCore/ServiceWorkerClientIdentifier.h>'],
@@ -740,7 +744,9 @@
'WebCore::ServiceWorkerRegistrationIdentifier': ['<WebCore/ServiceWorkerTypes.h>'],
'WebCore::ServiceWorkerRegistrationState': ['<WebCore/ServiceWorkerTypes.h>'],
'WebCore::ServiceWorkerState': ['<WebCore/ServiceWorkerTypes.h>'],
+ 'WebCore::ShareDataWithParsedURL': ['<WebCore/ShareData.h>'],
'WebCore::ShouldAskITP': ['<WebCore/NetworkStorageSession.h>'],
+ 'WebCore::ShouldContinuePolicyCheck': ['<WebCore/FrameLoaderTypes.h>'],
'WebCore::ShouldNotifyWhenResolved': ['<WebCore/ServiceWorkerTypes.h>'],
'WebCore::ShouldSample': ['<WebCore/DiagnosticLoggingClient.h>'],
'WebCore::SourceBufferAppendMode': ['<WebCore/SourceBufferPrivate.h>'],
@@ -754,14 +760,11 @@
'WebCore::TextCheckingType': ['<WebCore/TextChecking.h>'],
'WebCore::TextIndicatorData': ['<WebCore/TextIndicator.h>'],
'WebCore::ThirdPartyCookieBlockingMode': ['<WebCore/NetworkStorageSession.h>'],
- 'WebCore::SameSiteStrictEnforcementEnabled': ['<WebCore/NetworkStorageSession.h>'],
- 'WebCore::FirstPartyWebsiteDataRemovalMode': ['<WebCore/NetworkStorageSession.h>'],
'WebCore::UsedLegacyTLS': ['<WebCore/ResourceResponseBase.h>'],
'WebCore::VideoPresetData': ['<WebCore/VideoPreset.h>'],
'WebCore::ViewportAttributes': ['<WebCore/ViewportArguments.h>'],
'WebCore::WebGLLoadPolicy': ['<WebCore/FrameLoaderTypes.h>'],
'WebCore::WillContinueLoading': ['<WebCore/FrameLoaderTypes.h>'],
- 'WebCore::SelectionGeometry': ['"EditorState.h"'],
'WebKit::ActivityStateChangeID': ['"DrawingAreaInfo.h"'],
'WebKit::AllowOverwrite': ['"DownloadID.h"'],
'WebKit::AppPrivacyReportTestingData': ['"AppPrivacyReport.h"'],
@@ -783,8 +786,6 @@
'WebKit::SelectionTouch': ['"GestureTypes.h"'],
'WebKit::TapIdentifier': ['"IdentifierTypes.h"'],
'WebKit::TextCheckerRequestID': ['"IdentifierTypes.h"'],
- 'WebCore::MediaEngineSupportParameters': ['<WebCore/MediaPlayer.h>'],
- 'WebCore::ISOWebVTTCue': ['<WebCore/ISOVTTCue.h>'],
'struct WebCore::Cookie': ['<WebCore/Cookie.h>'],
'struct WebCore::ElementContext': ['<WebCore/ElementContext.h>'],
'struct WebCore::VideoPlaybackQualityMetrics': ['<WebCore/VideoPlaybackQualityMetrics.h>'],
Modified: trunk/Source/WebKit/UIProcess/MediaKeySystemPermissionRequestManagerProxy.h (281359 => 281360)
--- trunk/Source/WebKit/UIProcess/MediaKeySystemPermissionRequestManagerProxy.h 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/UIProcess/MediaKeySystemPermissionRequestManagerProxy.h 2021-08-21 02:56:54 UTC (rev 281360)
@@ -51,7 +51,7 @@
void invalidatePendingRequests();
- Ref<MediaKeySystemPermissionRequestProxy> createRequestForFrame(uint64_t userMediaID, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem);
+ Ref<MediaKeySystemPermissionRequestProxy> createRequestForFrame(uint64_t mediaKeySystemID, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, const String& keySystem);
void grantRequest(MediaKeySystemPermissionRequestProxy&);
void denyRequest(MediaKeySystemPermissionRequestProxy&, const String& message = { });
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (281359 => 281360)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2021-08-21 02:56:54 UTC (rev 281360)
@@ -50,12 +50,6 @@
#if ENABLE(MEDIA_STREAM)
static const MediaProducer::MediaStateFlags activeCaptureMask { MediaProducer::MediaState::HasActiveAudioCaptureDevice, MediaProducer::MediaState::HasActiveVideoCaptureDevice };
-
-static uint64_t generateRequestID()
-{
- static uint64_t uniqueRequestID = 1;
- return uniqueRequestID++;
-}
#endif
#if ENABLE(MEDIA_STREAM)
@@ -208,7 +202,7 @@
if (!m_page.hasRunningProcess())
return;
- ALWAYS_LOG(LOGIDENTIFIER, request.userMediaID(), ", reason: ", reason);
+ ALWAYS_LOG(LOGIDENTIFIER, request.userMediaID().toUInt64(), ", reason: ", reason);
if (reason == UserMediaPermissionRequestProxy::UserMediaAccessDenialReason::PermissionDenied)
m_deniedRequests.append(DeniedRequest { request.mainFrameID(), request.userMediaDocumentSecurityOrigin(), request.topLevelDocumentSecurityOrigin(), request.requiresAudioCapture(), request.requiresVideoCapture(), request.requiresDisplayCapture() });
@@ -237,7 +231,7 @@
return;
#if ENABLE(MEDIA_STREAM)
- ALWAYS_LOG(LOGIDENTIFIER, request.userMediaID(), ", video: ", request.videoDevice().label(), ", audio: ", request.audioDevice().label());
+ ALWAYS_LOG(LOGIDENTIFIER, request.userMediaID().toUInt64(), ", video: ", request.videoDevice().label(), ", audio: ", request.audioDevice().label());
if (auto callback = request.decisionCompletionHandler()) {
m_page.willStartCapture(request, [callback = WTFMove(callback)]() mutable {
@@ -270,7 +264,7 @@
void UserMediaPermissionRequestManagerProxy::finishGrantingRequest(UserMediaPermissionRequestProxy& request)
{
- ALWAYS_LOG(LOGIDENTIFIER, request.userMediaID());
+ ALWAYS_LOG(LOGIDENTIFIER, request.userMediaID().toUInt64());
updateStoredRequests(request);
if (!UserMediaProcessManager::singleton().willCreateMediaStream(*this, request.hasAudioDevice(), request.hasVideoDevice())) {
@@ -444,13 +438,13 @@
}
#endif
-void UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame(uint64_t userMediaID, FrameIdentifier frameID, Ref<SecurityOrigin>&& userMediaDocumentOrigin, Ref<SecurityOrigin>&& topLevelDocumentOrigin, MediaStreamRequest&& userRequest)
+void UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame(UserMediaRequestIdentifier userMediaID, FrameIdentifier frameID, Ref<SecurityOrigin>&& userMediaDocumentOrigin, Ref<SecurityOrigin>&& topLevelDocumentOrigin, MediaStreamRequest&& userRequest)
{
#if ENABLE(MEDIA_STREAM)
if (!m_page.hasRunningProcess())
return;
- ALWAYS_LOG(LOGIDENTIFIER, userMediaID);
+ ALWAYS_LOG(LOGIDENTIFIER, userMediaID.toUInt64());
auto request = UserMediaPermissionRequestProxy::create(*this, userMediaID, m_page.mainFrame()->frameID(), frameID, WTFMove(userMediaDocumentOrigin), WTFMove(topLevelDocumentOrigin), { }, { }, WTFMove(userRequest));
if (m_currentUserMediaRequest) {
@@ -516,7 +510,7 @@
void UserMediaPermissionRequestManagerProxy::processUserMediaPermissionRequest()
{
- ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID(), ", persistent access: ", m_currentUserMediaRequest->hasPersistentAccess());
+ ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID().toUInt64(), ", persistent access: ", m_currentUserMediaRequest->hasPersistentAccess());
auto& userMediaDocumentSecurityOrigin = m_currentUserMediaRequest->userMediaDocumentSecurityOrigin();
auto& topLevelDocumentSecurityOrigin = m_currentUserMediaRequest->topLevelDocumentSecurityOrigin();
@@ -559,7 +553,7 @@
void UserMediaPermissionRequestManagerProxy::processUserMediaPermissionInvalidRequest(const String& invalidConstraint)
{
- ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID());
+ ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID().toUInt64());
bool filterConstraint = !m_currentUserMediaRequest->hasPersistentAccess() && !wasGrantedVideoOrAudioAccess(m_currentUserMediaRequest->frameID(), m_currentUserMediaRequest->userMediaDocumentSecurityOrigin(), m_currentUserMediaRequest->topLevelDocumentSecurityOrigin());
denyRequest(*m_currentUserMediaRequest, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason::InvalidConstraint, filterConstraint ? String { } : invalidConstraint);
@@ -567,7 +561,7 @@
void UserMediaPermissionRequestManagerProxy::processUserMediaPermissionValidRequest(Vector<CaptureDevice>&& audioDevices, Vector<CaptureDevice>&& videoDevices, String&& deviceIdentifierHashSalt)
{
- ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID(), ", video: ", videoDevices.size(), " audio: ", audioDevices.size());
+ ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID().toUInt64(), ", video: ", videoDevices.size(), " audio: ", audioDevices.size());
if (videoDevices.isEmpty() && audioDevices.isEmpty()) {
denyRequest(*m_currentUserMediaRequest, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason::NoConstraints, emptyString());
return;
@@ -578,7 +572,7 @@
m_currentUserMediaRequest->setEligibleAudioDeviceUIDs(WTFMove(audioDevices));
auto action = ""
- ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID(), ", action: ", action);
+ ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID().toUInt64(), ", action: ", action);
if (action == RequestAction::Deny) {
denyRequest(*m_currentUserMediaRequest, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason::PermissionDenied, emptyString());
@@ -598,7 +592,7 @@
if (m_page.isControlledByAutomation()) {
if (WebAutomationSession* automationSession = m_page.process().processPool().automationSession()) {
- ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID(), ", page controlled by automation");
+ ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID().toUInt64(), ", page controlled by automation");
if (automationSession->shouldAllowGetUserMediaForPage(m_page))
grantRequest(*m_currentUserMediaRequest);
else
@@ -608,7 +602,7 @@
}
if (m_page.preferences().mockCaptureDevicesEnabled() && !m_page.preferences().mockCaptureDevicesPromptEnabled()) {
- ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID(), ", mock devices don't require prompt");
+ ALWAYS_LOG(LOGIDENTIFIER, m_currentUserMediaRequest->userMediaID().toUInt64(), ", mock devices don't require prompt");
grantRequest(*m_currentUserMediaRequest);
return;
}
@@ -652,7 +646,9 @@
return;
}
- auto request = UserMediaPermissionRequestProxy::create(*this, 0, frameIdentifier, frameIdentifier, requestingOrigin.isolatedCopy(), topOrigin.isolatedCopy(), Vector<WebCore::CaptureDevice> { device }, { }, { }, WTFMove(completionHandler));
+ // We use UserMediaRequestIdentifierType of 0 because this does not correspond to a UserMediaPermissionRequest in web process.
+ // We create the RequestProxy only to check the media permission for speech.
+ auto request = UserMediaPermissionRequestProxy::create(*this, makeObjectIdentifier<WebCore::UserMediaRequestIdentifierType>(0), frameIdentifier, frameIdentifier, requestingOrigin.isolatedCopy(), topOrigin.isolatedCopy(), Vector<WebCore::CaptureDevice> { device }, { }, { }, WTFMove(completionHandler));
// FIXME: Use switch on action.
auto action = ""
@@ -690,7 +686,7 @@
auto userMediaOrigin = API::SecurityOrigin::create(userMediaDocumentOrigin.get());
auto topLevelOrigin = API::SecurityOrigin::create(topLevelDocumentOrigin.get());
- auto requestID = generateRequestID();
+ auto requestID = MediaDevicePermissionRequestIdentifier::generate();
m_pendingDeviceRequests.add(requestID);
auto request = UserMediaPermissionCheckProxy::create(frameID, [this, weakThis = makeWeakPtr(*this), requestID, handler = WTFMove(handler)](auto permissionInfo) mutable {
@@ -805,7 +801,7 @@
if (!m_page.hasRunningProcess())
return;
- auto requestID = generateRequestID();
+ auto requestID = MediaDevicePermissionRequestIdentifier::generate();
m_pendingDeviceRequests.add(requestID);
auto& requestOrigin = userMediaDocumentOrigin.get();
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h (281359 => 281360)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h 2021-08-21 02:56:54 UTC (rev 281360)
@@ -44,6 +44,9 @@
class WebPageProxy;
+enum MediaDevicePermissionRequestIdentifierType { };
+using MediaDevicePermissionRequestIdentifier = ObjectIdentifier<MediaDevicePermissionRequestIdentifierType>;
+
class UserMediaPermissionRequestManagerProxy
#if ENABLE(MEDIA_STREAM)
: public WebCore::AudioCaptureFactory::ExtensiveObserver
@@ -69,7 +72,7 @@
void invalidatePendingRequests();
- void requestUserMediaPermissionForFrame(uint64_t userMediaID, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, WebCore::MediaStreamRequest&&);
+ void requestUserMediaPermissionForFrame(WebCore::UserMediaRequestIdentifier, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, WebCore::MediaStreamRequest&&);
void resetAccess(std::optional<WebCore::FrameIdentifier> mainFrameID = { });
void viewIsBecomingVisible();
@@ -116,7 +119,7 @@
WTFLogChannel& logChannel() const final;
#endif
- Ref<UserMediaPermissionRequestProxy> createPermissionRequest(uint64_t userMediaID, WebCore::FrameIdentifier mainFrameID, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, WebCore::MediaStreamRequest&&);
+ Ref<UserMediaPermissionRequestProxy> createPermissionRequest(WebCore::UserMediaRequestIdentifier, WebCore::FrameIdentifier mainFrameID, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, WebCore::MediaStreamRequest&&);
#if ENABLE(MEDIA_STREAM)
void finishGrantingRequest(UserMediaPermissionRequestProxy&);
@@ -152,7 +155,7 @@
RefPtr<UserMediaPermissionRequestProxy> m_currentUserMediaRequest;
Deque<Ref<UserMediaPermissionRequestProxy>> m_pendingUserMediaRequests;
- HashSet<uint64_t> m_pendingDeviceRequests;
+ HashSet<MediaDevicePermissionRequestIdentifier> m_pendingDeviceRequests;
WebPageProxy& m_page;
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.cpp (281359 => 281360)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.cpp 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.cpp 2021-08-21 02:56:54 UTC (rev 281360)
@@ -31,7 +31,7 @@
namespace WebKit {
using namespace WebCore;
-UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, FrameIdentifier mainFrameID, FrameIdentifier frameID, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, WebCore::MediaStreamRequest&& request, CompletionHandler<void(bool)>&& decisionCompletionHandler)
+UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy& manager, UserMediaRequestIdentifier userMediaID, FrameIdentifier mainFrameID, FrameIdentifier frameID, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, WebCore::MediaStreamRequest&& request, CompletionHandler<void(bool)>&& decisionCompletionHandler)
: m_manager(&manager)
, m_userMediaID(userMediaID)
, m_mainFrameID(mainFrameID)
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.h (281359 => 281360)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.h 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.h 2021-08-21 02:56:54 UTC (rev 281360)
@@ -23,6 +23,7 @@
#include <WebCore/CaptureDevice.h>
#include <WebCore/FrameIdentifier.h>
#include <WebCore/MediaStreamRequest.h>
+#include <WebCore/UserMediaRequestIdentifier.h>
#include <wtf/CompletionHandler.h>
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
@@ -37,7 +38,7 @@
class UserMediaPermissionRequestProxy : public API::ObjectImpl<API::Object::Type::UserMediaPermissionRequest> {
public:
- static Ref<UserMediaPermissionRequestProxy> create(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, WebCore::FrameIdentifier mainFrameID, WebCore::FrameIdentifier frameID, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, WebCore::MediaStreamRequest&& request, CompletionHandler<void(bool)>&& decisionCompletionHandler = { })
+ static Ref<UserMediaPermissionRequestProxy> create(UserMediaPermissionRequestManagerProxy& manager, WebCore::UserMediaRequestIdentifier userMediaID, WebCore::FrameIdentifier mainFrameID, WebCore::FrameIdentifier frameID, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, WebCore::MediaStreamRequest&& request, CompletionHandler<void(bool)>&& decisionCompletionHandler = { })
{
return adoptRef(*new UserMediaPermissionRequestProxy(manager, userMediaID, mainFrameID, frameID, WTFMove(userMediaDocumentOrigin), WTFMove(topLevelDocumentOrigin), WTFMove(audioDevices), WTFMove(videoDevices), WTFMove(request), WTFMove(decisionCompletionHandler)));
}
@@ -67,7 +68,7 @@
bool hasPersistentAccess() const { return m_hasPersistentAccess; }
void setHasPersistentAccess() { m_hasPersistentAccess = true; }
- uint64_t userMediaID() const { return m_userMediaID; }
+ WebCore::UserMediaRequestIdentifier userMediaID() const { return m_userMediaID; }
WebCore::FrameIdentifier mainFrameID() const { return m_mainFrameID; }
WebCore::FrameIdentifier frameID() const { return m_frameID; }
@@ -93,10 +94,10 @@
CompletionHandler<void(bool)> decisionCompletionHandler() { return std::exchange(m_decisionCompletionHandler, { }); }
private:
- UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy&, uint64_t userMediaID, WebCore::FrameIdentifier mainFrameID, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, WebCore::MediaStreamRequest&&, CompletionHandler<void(bool)>&&);
+ UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy&, WebCore::UserMediaRequestIdentifier, WebCore::FrameIdentifier mainFrameID, WebCore::FrameIdentifier, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, WebCore::MediaStreamRequest&&, CompletionHandler<void(bool)>&&);
UserMediaPermissionRequestManagerProxy* m_manager;
- uint64_t m_userMediaID;
+ WebCore::UserMediaRequestIdentifier m_userMediaID;
WebCore::FrameIdentifier m_mainFrameID;
WebCore::FrameIdentifier m_frameID;
Ref<WebCore::SecurityOrigin> m_userMediaDocumentSecurityOrigin;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (281359 => 281360)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-08-21 02:56:54 UTC (rev 281360)
@@ -8506,7 +8506,7 @@
#endif
-void WebPageProxy::requestUserMediaPermissionForFrame(uint64_t userMediaID, FrameIdentifier frameID, const WebCore::SecurityOriginData& userMediaDocumentOriginData, const WebCore::SecurityOriginData& topLevelDocumentOriginData, WebCore::MediaStreamRequest&& request)
+void WebPageProxy::requestUserMediaPermissionForFrame(UserMediaRequestIdentifier userMediaID, FrameIdentifier frameID, const WebCore::SecurityOriginData& userMediaDocumentOriginData, const WebCore::SecurityOriginData& topLevelDocumentOriginData, WebCore::MediaStreamRequest&& request)
{
#if ENABLE(MEDIA_STREAM)
MESSAGE_CHECK(m_process, m_process->webFrame(frameID));
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (281359 => 281360)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-08-21 02:56:54 UTC (rev 281360)
@@ -2125,7 +2125,7 @@
#if ENABLE(MEDIA_STREAM)
UserMediaPermissionRequestManagerProxy& userMediaPermissionRequestManager();
#endif
- void requestUserMediaPermissionForFrame(uint64_t userMediaID, WebCore::FrameIdentifier, const WebCore::SecurityOriginData& userMediaDocumentOriginIdentifier, const WebCore::SecurityOriginData& topLevelDocumentOriginIdentifier, WebCore::MediaStreamRequest&&);
+ void requestUserMediaPermissionForFrame(WebCore::UserMediaRequestIdentifier, WebCore::FrameIdentifier, const WebCore::SecurityOriginData& userMediaDocumentOriginIdentifier, const WebCore::SecurityOriginData& topLevelDocumentOriginIdentifier, WebCore::MediaStreamRequest&&);
void enumerateMediaDevicesForFrame(WebCore::FrameIdentifier, const WebCore::SecurityOriginData& userMediaDocumentOriginData, const WebCore::SecurityOriginData& topLevelDocumentOriginData, CompletionHandler<void(const Vector<WebCore::CaptureDevice>&, const String&)>&&);
void beginMonitoringCaptureDevices();
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (281359 => 281360)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-08-21 02:56:54 UTC (rev 281360)
@@ -269,13 +269,13 @@
#if ENABLE(MEDIA_STREAM)
# MediaSteam messages
- RequestUserMediaPermissionForFrame(uint64_t userMediaID, WebCore::FrameIdentifier frameID, struct WebCore::SecurityOriginData userMediaDocumentOriginIdentifier, struct WebCore::SecurityOriginData topLevelDocumentOriginIdentifier, struct WebCore::MediaStreamRequest request)
+ RequestUserMediaPermissionForFrame(WebCore::UserMediaRequestIdentifier userMediaID, WebCore::FrameIdentifier frameID, struct WebCore::SecurityOriginData userMediaDocumentOriginIdentifier, struct WebCore::SecurityOriginData topLevelDocumentOriginIdentifier, struct WebCore::MediaStreamRequest request)
EnumerateMediaDevicesForFrame(WebCore::FrameIdentifier frameID, struct WebCore::SecurityOriginData userMediaDocumentOriginIdentifier, struct WebCore::SecurityOriginData topLevelDocumentOriginIdentifier) -> (Vector<WebCore::CaptureDevice> devices, String mediaDeviceIdentifierHashSalt) Async
BeginMonitoringCaptureDevices()
#endif
#if ENABLE(ENCRYPTED_MEDIA)
- RequestMediaKeySystemPermissionForFrame(uint64_t userMediaID, WebCore::FrameIdentifier frameID, struct WebCore::SecurityOriginData topLevelDocumentOriginIdentifier, String keySystem)
+ RequestMediaKeySystemPermissionForFrame(uint64_t mediaKeySystemID, WebCore::FrameIdentifier frameID, struct WebCore::SecurityOriginData topLevelDocumentOriginIdentifier, String keySystem)
#endif
# Notification messages
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (281359 => 281360)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-08-21 02:56:54 UTC (rev 281360)
@@ -2531,6 +2531,8 @@
0F931C1A18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeScrollingNodeDelegateIOS.h; sourceTree = "<group>"; };
0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingTreeOverflowScrollingNodeIOS.mm; sourceTree = "<group>"; };
0F931C1B18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingTreeScrollingNodeDelegateIOS.mm; sourceTree = "<group>"; };
+ 0F9FA7DA26CEFAD100872684 /* MediaKeySystemPermissionRequestManagerProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaKeySystemPermissionRequestManagerProxy.cpp; sourceTree = "<group>"; };
+ 0F9FA7DB26CEFADA00872684 /* MediaKeySystemPermissionRequestProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaKeySystemPermissionRequestProxy.cpp; sourceTree = "<group>"; };
0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; };
0FBB5FBF2609A0910054572C /* DisplayRefreshMonitorMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayRefreshMonitorMac.h; sourceTree = "<group>"; };
0FBB5FC02609A0910054572C /* DisplayRefreshMonitorMac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DisplayRefreshMonitorMac.cpp; sourceTree = "<group>"; };
@@ -10069,7 +10071,9 @@
5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */,
31607F3819627002009B87DA /* LegacySessionStateCoding.h */,
9ACC07B025C815D800DC6386 /* MediaKeySystemPermissionRequest.h */,
+ 0F9FA7DA26CEFAD100872684 /* MediaKeySystemPermissionRequestManagerProxy.cpp */,
9ACC07B225C815F300DC6386 /* MediaKeySystemPermissionRequestManagerProxy.h */,
+ 0F9FA7DB26CEFADA00872684 /* MediaKeySystemPermissionRequestProxy.cpp */,
9ACC07B425C8160B00DC6386 /* MediaKeySystemPermissionRequestProxy.h */,
93425898255B534B0059EEDD /* MediaPermissionUtilities.h */,
7137BA7E25F1540B00914EE3 /* ModelElementController.cpp */,
Modified: trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp (281359 => 281360)
--- trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2021-08-21 02:56:54 UTC (rev 281360)
@@ -80,7 +80,7 @@
ASSERT(webFrame);
auto* topLevelDocumentOrigin = userRequest.topLevelDocumentOrigin();
- m_page.send(Messages::WebPageProxy::RequestUserMediaPermissionForFrame(userRequest.identifier().toUInt64(), webFrame->frameID(), userRequest.userMediaDocumentOrigin()->data(), topLevelDocumentOrigin->data(), userRequest.request()));
+ m_page.send(Messages::WebPageProxy::RequestUserMediaPermissionForFrame(userRequest.identifier(), webFrame->frameID(), userRequest.userMediaDocumentOrigin()->data(), topLevelDocumentOrigin->data(), userRequest.request()));
}
void UserMediaPermissionRequestManager::cancelUserMediaRequest(UserMediaRequest& request)
@@ -117,9 +117,9 @@
sendUserMediaRequest(pendingRequest);
}
-void UserMediaPermissionRequestManager::userMediaAccessWasGranted(uint64_t requestID, CaptureDevice&& audioDevice, CaptureDevice&& videoDevice, String&& deviceIdentifierHashSalt, CompletionHandler<void()>&& completionHandler)
+void UserMediaPermissionRequestManager::userMediaAccessWasGranted(UserMediaRequestIdentifier requestID, CaptureDevice&& audioDevice, CaptureDevice&& videoDevice, String&& deviceIdentifierHashSalt, CompletionHandler<void()>&& completionHandler)
{
- auto request = m_ongoingUserMediaRequests.take(makeObjectIdentifier<UserMediaRequestIdentifierType>(requestID));
+ auto request = m_ongoingUserMediaRequests.take(requestID);
if (!request) {
completionHandler();
return;
@@ -128,9 +128,9 @@
request->allow(WTFMove(audioDevice), WTFMove(videoDevice), WTFMove(deviceIdentifierHashSalt), WTFMove(completionHandler));
}
-void UserMediaPermissionRequestManager::userMediaAccessWasDenied(uint64_t requestID, UserMediaRequest::MediaAccessDenialReason reason, String&& invalidConstraint)
+void UserMediaPermissionRequestManager::userMediaAccessWasDenied(UserMediaRequestIdentifier requestID, UserMediaRequest::MediaAccessDenialReason reason, String&& invalidConstraint)
{
- auto request = m_ongoingUserMediaRequests.take(makeObjectIdentifier<UserMediaRequestIdentifierType>(requestID));
+ auto request = m_ongoingUserMediaRequests.take(requestID);
if (!request)
return;
Modified: trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.h (281359 => 281360)
--- trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.h 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.h 2021-08-21 02:56:54 UTC (rev 281360)
@@ -21,6 +21,7 @@
#if ENABLE(MEDIA_STREAM)
+#include "IdentifierTypes.h"
#include "SandboxExtension.h"
#include <WebCore/MediaCanStartListener.h>
#include <WebCore/MediaConstraints.h>
@@ -50,8 +51,8 @@
void startUserMediaRequest(WebCore::UserMediaRequest&);
void cancelUserMediaRequest(WebCore::UserMediaRequest&);
- void userMediaAccessWasGranted(uint64_t, WebCore::CaptureDevice&& audioDevice, WebCore::CaptureDevice&& videoDevice, String&& deviceIdentifierHashSalt, CompletionHandler<void()>&&);
- void userMediaAccessWasDenied(uint64_t, WebCore::UserMediaRequest::MediaAccessDenialReason, String&&);
+ void userMediaAccessWasGranted(WebCore::UserMediaRequestIdentifier, WebCore::CaptureDevice&& audioDevice, WebCore::CaptureDevice&& videoDevice, String&& deviceIdentifierHashSalt, CompletionHandler<void()>&&);
+ void userMediaAccessWasDenied(WebCore::UserMediaRequestIdentifier, WebCore::UserMediaRequest::MediaAccessDenialReason, String&&);
void enumerateMediaDevices(WebCore::Document&, CompletionHandler<void(const Vector<WebCore::CaptureDevice>&, const String&)>&&);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (281359 => 281360)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-08-21 02:56:54 UTC (rev 281360)
@@ -4714,7 +4714,7 @@
#if ENABLE(MEDIA_STREAM)
-void WebPage::userMediaAccessWasGranted(uint64_t userMediaID, WebCore::CaptureDevice&& audioDevice, WebCore::CaptureDevice&& videoDevice, String&& mediaDeviceIdentifierHashSalt, SandboxExtension::Handle&& handle, CompletionHandler<void()>&& completionHandler)
+void WebPage::userMediaAccessWasGranted(UserMediaRequestIdentifier userMediaID, WebCore::CaptureDevice&& audioDevice, WebCore::CaptureDevice&& videoDevice, String&& mediaDeviceIdentifierHashSalt, SandboxExtension::Handle&& handle, CompletionHandler<void()>&& completionHandler)
{
SandboxExtension::consumePermanently(handle);
@@ -4721,7 +4721,7 @@
m_userMediaPermissionRequestManager->userMediaAccessWasGranted(userMediaID, WTFMove(audioDevice), WTFMove(videoDevice), WTFMove(mediaDeviceIdentifierHashSalt), WTFMove(completionHandler));
}
-void WebPage::userMediaAccessWasDenied(uint64_t userMediaID, uint64_t reason, String&& invalidConstraint)
+void WebPage::userMediaAccessWasDenied(UserMediaRequestIdentifier userMediaID, uint64_t reason, String&& invalidConstraint)
{
m_userMediaPermissionRequestManager->userMediaAccessWasDenied(userMediaID, static_cast<UserMediaRequest::MediaAccessDenialReason>(reason), WTFMove(invalidConstraint));
}
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (281359 => 281360)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-08-21 02:56:54 UTC (rev 281360)
@@ -90,6 +90,7 @@
#include <WebCore/UserActivity.h>
#include <WebCore/UserContentTypes.h>
#include <WebCore/UserInterfaceLayoutDirection.h>
+#include <WebCore/UserMediaRequestIdentifier.h>
#include <WebCore/UserScriptTypes.h>
#include <WebCore/VisibilityState.h>
#include <WebCore/WebCoreKeyboardUIMode.h>
@@ -1764,8 +1765,8 @@
void didReceiveGeolocationPermissionDecision(GeolocationIdentifier, const String& authorizationToken);
#if ENABLE(MEDIA_STREAM)
- void userMediaAccessWasGranted(uint64_t userMediaID, WebCore::CaptureDevice&& audioDeviceUID, WebCore::CaptureDevice&& videoDeviceUID, String&& mediaDeviceIdentifierHashSalt, SandboxExtension::Handle&&, CompletionHandler<void()>&&);
- void userMediaAccessWasDenied(uint64_t userMediaID, uint64_t reason, String&& invalidConstraint);
+ void userMediaAccessWasGranted(WebCore::UserMediaRequestIdentifier, WebCore::CaptureDevice&& audioDeviceUID, WebCore::CaptureDevice&& videoDeviceUID, String&& mediaDeviceIdentifierHashSalt, SandboxExtension::Handle&&, CompletionHandler<void()>&&);
+ void userMediaAccessWasDenied(WebCore::UserMediaRequestIdentifier, uint64_t reason, String&& invalidConstraint);
#endif
#if ENABLE(ENCRYPTED_MEDIA)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (281359 => 281360)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2021-08-21 02:48:24 UTC (rev 281359)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2021-08-21 02:56:54 UTC (rev 281360)
@@ -377,8 +377,8 @@
#if ENABLE(MEDIA_STREAM)
# MediaSteam
- UserMediaAccessWasGranted(uint64_t userMediaID, WebCore::CaptureDevice audioDevice, WebCore::CaptureDevice videoDevice, String mediaDeviceIdentifierHashSalt, WebKit::SandboxExtension::Handle sandboxExtensionHandle) -> () Async
- UserMediaAccessWasDenied(uint64_t userMediaID, uint64_t reason, String invalidConstraint)
+ UserMediaAccessWasGranted(WebCore::UserMediaRequestIdentifier userMediaID, WebCore::CaptureDevice audioDevice, WebCore::CaptureDevice videoDevice, String mediaDeviceIdentifierHashSalt, WebKit::SandboxExtension::Handle sandboxExtensionHandle) -> () Async
+ UserMediaAccessWasDenied(WebCore::UserMediaRequestIdentifier userMediaID, uint64_t reason, String invalidConstraint)
CaptureDevicesChanged()
#endif
