Title: [242089] trunk
- Revision
- 242089
- Author
- [email protected]
- Date
- 2019-02-26 10:09:19 -0800 (Tue, 26 Feb 2019)
Log Message
WebPageProxy should nullify m_userMediaPermissionRequestManager after resetting the media state
https://bugs.webkit.org/show_bug.cgi?id=195028
<rdar://problem/48243733>
Reviewed by Eric Carlson.
Source/WebKit:
Covered by API test.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::resetState):
Tools:
* TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (242088 => 242089)
--- trunk/Source/WebKit/ChangeLog 2019-02-26 18:01:57 UTC (rev 242088)
+++ trunk/Source/WebKit/ChangeLog 2019-02-26 18:09:19 UTC (rev 242089)
@@ -1,3 +1,16 @@
+2019-02-26 Youenn Fablet <[email protected]>
+
+ WebPageProxy should nullify m_userMediaPermissionRequestManager after resetting the media state
+ https://bugs.webkit.org/show_bug.cgi?id=195028
+ <rdar://problem/48243733>
+
+ Reviewed by Eric Carlson.
+
+ Covered by API test.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::resetState):
+
2019-02-26 Philippe Normand <[email protected]> and Carlos Garcia Campos <[email protected]>
[WPE] Add API for webview background color configuration
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (242088 => 242089)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-02-26 18:01:57 UTC (rev 242088)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-02-26 18:09:19 UTC (rev 242089)
@@ -6707,10 +6707,6 @@
m_geolocationPermissionRequestManager.invalidateRequests();
#endif
-#if ENABLE(MEDIA_STREAM)
- m_userMediaPermissionRequestManager = nullptr;
-#endif
-
m_notificationPermissionRequestManager.invalidateRequests();
m_toolTip = String();
@@ -6783,7 +6779,11 @@
editCommand->invalidate();
m_activePopupMenu = nullptr;
+
updatePlayingMediaDidChange(MediaProducer::IsNotPlaying);
+#if ENABLE(MEDIA_STREAM)
+ m_userMediaPermissionRequestManager = nullptr;
+#endif
#if ENABLE(POINTER_LOCK)
requestPointerUnlock();
Modified: trunk/Tools/ChangeLog (242088 => 242089)
--- trunk/Tools/ChangeLog 2019-02-26 18:01:57 UTC (rev 242088)
+++ trunk/Tools/ChangeLog 2019-02-26 18:09:19 UTC (rev 242089)
@@ -1,3 +1,13 @@
+2019-02-26 Youenn Fablet <[email protected]>
+
+ WebPageProxy should nullify m_userMediaPermissionRequestManager after resetting the media state
+ https://bugs.webkit.org/show_bug.cgi?id=195028
+ <rdar://problem/48243733>
+
+ Reviewed by Eric Carlson.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
+
2019-02-26 Philippe Normand <[email protected]>
[WPE] Add API for webview background color configuration
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm (242088 => 242089)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm 2019-02-26 18:01:57 UTC (rev 242088)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm 2019-02-26 18:09:19 UTC (rev 242089)
@@ -5273,6 +5273,11 @@
EXPECT_FALSE(isCapturing);
EXPECT_FALSE(pid1 == pid2);
+
+ isCapturing = false;
+ [webView goBack];
+ TestWebKitAPI::Util::run(&isCapturing);
+ isCapturing = false;
}
#if !PLATFORM(MAC)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
