<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280500] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280500">280500</a></dd>
<dt>Author</dt> <dd>jya@apple.com</dd>
<dt>Date</dt> <dd>2021-07-30 15:38:29 -0700 (Fri, 30 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/274460">r274460</a>?): Infinite recursion on fullscreen/full-screen-remove-ancestor.html in WTR::InjectedBundlePage::closeFullScreen
https://bugs.webkit.org/show_bug.cgi?id=224085
rdar://75576840

Reviewed by Eric Carlson.

Source/WebKit:

WebFullScreenManager::close() is used to cleanup a transient error when exiting or
attempting to exit fullscreen; it then calls InjectedBundleXXX::closeFullScreen().
It is possible for the injected bundle's closeFullScreen() to attempt to exit full
screen mode again.
Rather than making the bundle responsible for doing the right thing, we add a
workaround in the fullscreen manager to ensure no recursion is happening.

Covered by existing test.

* WebProcess/FullScreen/WebFullScreenManager.cpp:
(WebKit::WebFullScreenManager::close):
* WebProcess/FullScreen/WebFullScreenManager.h: Make close() method private

LayoutTests:

* platform/mac-wk2/TestExpectations: re-enable test.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessFullScreenWebFullScreenManagercpp">trunk/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessFullScreenWebFullScreenManagerh">trunk/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (280499 => 280500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-07-30 22:29:52 UTC (rev 280499)
+++ trunk/LayoutTests/ChangeLog 2021-07-30 22:38:29 UTC (rev 280500)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-07-30  Jean-Yves Avenard  <jya@apple.com>
+
+        REGRESSION (r274460?): Infinite recursion on fullscreen/full-screen-remove-ancestor.html in WTR::InjectedBundlePage::closeFullScreen
+        https://bugs.webkit.org/show_bug.cgi?id=224085
+        rdar://75576840
+
+        Reviewed by Eric Carlson.
+
+        * platform/mac-wk2/TestExpectations: re-enable test.
+
</ins><span class="cx"> 2021-07-30  Ayumi Kojima  <ayumi_kojima@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [ iPad ] fast/canvas/canvas-color-space-display-p3.html is failing.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (280499 => 280500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations      2021-07-30 22:29:52 UTC (rev 280499)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2021-07-30 22:38:29 UTC (rev 280500)
</span><span class="lines">@@ -1500,8 +1500,6 @@
</span><span class="cx"> # rdar://80335452 ([ Monterey wk2 Release ] fast/scrolling/iframe-scrollable-after-back.html is a flaky timeout)
</span><span class="cx"> [ Monterey ] fast/scrolling/iframe-scrollable-after-back.html [ Pass Timeout ]
</span><span class="cx"> 
</span><del>-webkit.org/b/224085 fullscreen/full-screen-remove-ancestor.html [ Skip ]
-
</del><span class="cx"> webkit.org/b/227776 [ BigSur Release arm64 ] scrollbars/corner-resizer-window-inactive.html [ Pass ImageOnlyFailure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/227776 [ Catalina Release ] scrollbars/corner-resizer-window-inactive.html [ Pass ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (280499 => 280500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-07-30 22:29:52 UTC (rev 280499)
+++ trunk/Source/WebKit/ChangeLog       2021-07-30 22:38:29 UTC (rev 280500)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2021-07-30  Jean-Yves Avenard  <jya@apple.com>
+
+        REGRESSION (r274460?): Infinite recursion on fullscreen/full-screen-remove-ancestor.html in WTR::InjectedBundlePage::closeFullScreen
+        https://bugs.webkit.org/show_bug.cgi?id=224085
+        rdar://75576840
+
+        Reviewed by Eric Carlson.
+
+        WebFullScreenManager::close() is used to cleanup a transient error when exiting or
+        attempting to exit fullscreen; it then calls InjectedBundleXXX::closeFullScreen().
+        It is possible for the injected bundle's closeFullScreen() to attempt to exit full
+        screen mode again.
+        Rather than making the bundle responsible for doing the right thing, we add a
+        workaround in the fullscreen manager to ensure no recursion is happening.
+
+        Covered by existing test.
+
+        * WebProcess/FullScreen/WebFullScreenManager.cpp:
+        (WebKit::WebFullScreenManager::close):
+        * WebProcess/FullScreen/WebFullScreenManager.h: Make close() method private
+
</ins><span class="cx"> 2021-07-30  Tim Horton  <timothy_horton@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Accessibility code logs to stderr in many layout test runs
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessFullScreenWebFullScreenManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp (280499 => 280500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp       2021-07-30 22:29:52 UTC (rev 280499)
+++ trunk/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp  2021-07-30 22:38:29 UTC (rev 280500)
</span><span class="lines">@@ -263,8 +263,12 @@
</span><span class="cx"> 
</span><span class="cx"> void WebFullScreenManager::close()
</span><span class="cx"> {
</span><ins>+    if (m_closing)
+        return;
+    m_closing = true;
</ins><span class="cx">     LOG(Fullscreen, "WebFullScreenManager %p close()", this);
</span><span class="cx">     m_page->injectedBundleFullScreenClient().closeFullScreen(m_page.get());
</span><ins>+    m_closing = false;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebFullScreenManager::saveScrollPosition()
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessFullScreenWebFullScreenManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.h (280499 => 280500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.h 2021-07-30 22:29:52 UTC (rev 280499)
+++ trunk/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.h    2021-07-30 22:38:29 UTC (rev 280500)
</span><span class="lines">@@ -69,8 +69,6 @@
</span><span class="cx"> 
</span><span class="cx">     void videoControlsManagerDidChange();
</span><span class="cx"> 
</span><del>-    void close();
-
</del><span class="cx"> protected:
</span><span class="cx">     WebFullScreenManager(WebPage*);
</span><span class="cx"> 
</span><span class="lines">@@ -96,6 +94,10 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx">     RefPtr<WebCore::HTMLVideoElement> m_pipStandbyElement;
</span><span class="cx"> #endif
</span><ins>+
+private:
+    void close();
+    bool m_closing { false };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>

</body>
</html>