Title: [237788] trunk/Source/WebKit
- Revision
- 237788
- Author
- [email protected]
- Date
- 2018-11-04 20:29:02 -0800 (Sun, 04 Nov 2018)
Log Message
[MediaStream] User should not be prompted again after denying getDisplayMedia request
https://bugs.webkit.org/show_bug.cgi?id=191227
<rdar://problem/45784512>
Unreviewed build fix of ports not ENABLE(MEDIA_STREAM).
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp: Define getRequestAction only if ENABLE(MEDIA_STREAM).
* UIProcess/UserMediaPermissionRequestManagerProxy.h: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (237787 => 237788)
--- trunk/Source/WebKit/ChangeLog 2018-11-05 02:15:48 UTC (rev 237787)
+++ trunk/Source/WebKit/ChangeLog 2018-11-05 04:29:02 UTC (rev 237788)
@@ -1,3 +1,14 @@
+2018-11-04 Fujii Hironori <[email protected]>
+
+ [MediaStream] User should not be prompted again after denying getDisplayMedia request
+ https://bugs.webkit.org/show_bug.cgi?id=191227
+ <rdar://problem/45784512>
+
+ Unreviewed build fix of ports not ENABLE(MEDIA_STREAM).
+
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp: Define getRequestAction only if ENABLE(MEDIA_STREAM).
+ * UIProcess/UserMediaPermissionRequestManagerProxy.h: Ditto.
+
2018-11-04 Zalan Bujtas <[email protected]>
[iOS] Issue initial paint soon after the visuallyNonEmpty milestone is fired.
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (237787 => 237788)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2018-11-05 02:15:48 UTC (rev 237787)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2018-11-05 04:29:02 UTC (rev 237788)
@@ -261,6 +261,7 @@
m_rejectionTimer.startOneShot(Seconds(mimimumDelayBeforeReplying + randomNumber()));
}
+#if ENABLE(MEDIA_STREAM)
UserMediaPermissionRequestManagerProxy::RequestAction UserMediaPermissionRequestManagerProxy::getRequestAction(uint64_t frameID, SecurityOrigin& userMediaDocumentOrigin, SecurityOrigin& topLevelDocumentOrigin, const MediaStreamRequest& userRequest, Vector<CaptureDevice>& audioDevices, Vector<CaptureDevice>& videoDevices)
{
if (videoDevices.isEmpty() && audioDevices.isEmpty())
@@ -280,6 +281,7 @@
return searchForGrantedRequest(frameID, userMediaDocumentOrigin, topLevelDocumentOrigin, requestingMicrophone, requestingCamera) ? RequestAction::Grant : RequestAction::Prompt;
}
+#endif
void UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, Ref<SecurityOrigin>&& userMediaDocumentOrigin, Ref<SecurityOrigin>&& topLevelDocumentOrigin, const MediaStreamRequest& userRequest)
{
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h (237787 => 237788)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h 2018-11-05 02:15:48 UTC (rev 237787)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h 2018-11-05 04:29:02 UTC (rev 237788)
@@ -74,7 +74,7 @@
const UserMediaPermissionRequestProxy* searchForGrantedRequest(uint64_t frameID, const WebCore::SecurityOrigin& userMediaDocumentOrigin, const WebCore::SecurityOrigin& topLevelDocumentOrigin, bool needsAudio, bool needsVideo) const;
bool wasRequestDenied(uint64_t mainFrameID, const WebCore::SecurityOrigin& userMediaDocumentOrigin, const WebCore::SecurityOrigin& topLevelDocumentOrigin, bool needsAudio, bool needsVideo, bool needsScreenCapture);
-#endif
+
void getUserMediaPermissionInfo(uint64_t userMediaID, uint64_t frameID, UserMediaPermissionCheckProxy::CompletionHandler&&, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin);
enum class RequestAction {
@@ -83,6 +83,7 @@
Prompt
};
RequestAction getRequestAction(uint64_t frameID, WebCore::SecurityOrigin& userMediaDocumentOrigin, WebCore::SecurityOrigin& topLevelDocumentOrigin, const WebCore::MediaStreamRequest&, Vector<WebCore::CaptureDevice>& audioDevices, Vector<WebCore::CaptureDevice>& videoDevices);
+#endif
void watchdogTimerFired();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
