[webkit-changes] [242172] branches/safari-607.1.40.1-branch

Wed, 27 Feb 2019 15:53:27 -0800

Title: [242172] branches/safari-607.1.40.1-branch
Revision
242172
Author
[email protected]
Date
2019-02-27 15:52:01 -0800 (Wed, 27 Feb 2019)

Log Message

Cherry-pick r242089. rdar://problem/48445620

    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:

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

Modified Paths

Diff

Modified: branches/safari-607.1.40.1-branch/Source/WebKit/ChangeLog (242171 => 242172)


--- branches/safari-607.1.40.1-branch/Source/WebKit/ChangeLog	2019-02-27 23:45:42 UTC (rev 242171)
+++ branches/safari-607.1.40.1-branch/Source/WebKit/ChangeLog	2019-02-27 23:52:01 UTC (rev 242172)
@@ -1,3 +1,40 @@
+2019-02-27  Kocsen Chung  <[email protected]>
+
+        Cherry-pick r242089. rdar://problem/48445620
+
+    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:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242089 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-24  Babak Shafiei  <[email protected]>
 
         Cherry-pick r241963. rdar://problem/48350367

Modified: branches/safari-607.1.40.1-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (242171 => 242172)


--- branches/safari-607.1.40.1-branch/Source/WebKit/UIProcess/WebPageProxy.cpp	2019-02-27 23:45:42 UTC (rev 242171)
+++ branches/safari-607.1.40.1-branch/Source/WebKit/UIProcess/WebPageProxy.cpp	2019-02-27 23:52:01 UTC (rev 242172)
@@ -6637,10 +6637,6 @@
     m_geolocationPermissionRequestManager.invalidateRequests();
 #endif
 
-#if ENABLE(MEDIA_STREAM)
-    m_userMediaPermissionRequestManager = nullptr;
-#endif
-
     m_notificationPermissionRequestManager.invalidateRequests();
 
     m_toolTip = String();
@@ -6716,7 +6712,11 @@
         editCommand->invalidate();
 
     m_activePopupMenu = nullptr;
+
     updatePlayingMediaDidChange(MediaProducer::IsNotPlaying);
+#if ENABLE(MEDIA_STREAM)
+    m_userMediaPermissionRequestManager = nullptr;
+#endif
 
 #if ENABLE(POINTER_LOCK)
     requestPointerUnlock();

Modified: branches/safari-607.1.40.1-branch/Tools/ChangeLog (242171 => 242172)


--- branches/safari-607.1.40.1-branch/Tools/ChangeLog	2019-02-27 23:45:42 UTC (rev 242171)
+++ branches/safari-607.1.40.1-branch/Tools/ChangeLog	2019-02-27 23:52:01 UTC (rev 242172)
@@ -1,3 +1,37 @@
+2019-02-27  Kocsen Chung  <[email protected]>
+
+        Cherry-pick r242089. rdar://problem/48445620
+
+    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:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242089 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-24  Babak Shafiei  <[email protected]>
 
         Cherry-pick r241963. rdar://problem/48350367

Modified: branches/safari-607.1.40.1-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm (242171 => 242172)


--- branches/safari-607.1.40.1-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm	2019-02-27 23:45:42 UTC (rev 242171)
+++ branches/safari-607.1.40.1-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm	2019-02-27 23:52:01 UTC (rev 242172)
@@ -5265,6 +5265,11 @@
 
     EXPECT_FALSE(isCapturing);
     EXPECT_FALSE(pid1 == pid2);
+
+    isCapturing = false;
+    [webView goBack];
+    TestWebKitAPI::Util::run(&isCapturing);
+    isCapturing = false;
 }
 
 static void traverseLayerTree(CALayer *layer, void(^block)(CALayer *))

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to