<!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>[280976] trunk/Source</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/280976">280976</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2021-08-12 12:16:04 -0700 (Thu, 12 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[macOS] Enter fullscreen animation interferes with auto-hiding menu bar
https://bugs.webkit.org/show_bug.cgi?id=229039
<rdar://79150656>

Reviewed by Eric Carlson.

Source/WebCore:

Add a new utility method to calculate the available screen rect taking menu bar
hiding into account.

* platform/PlatformScreen.h:
* platform/mac/PlatformScreenMac.mm:
(WebCore::screenRectAvoidingMenuBar):

Source/WebKit:

When entering fullscreen, if a user has unchecked the "auto-hide menu bar in fullscreen"
setting, the fullscreen animation will enter to the full screen frame, then snap down once
the animation completes to reveal the menu bar. Instead, use a WebCore utility method to
calculate the screen's frame taking that menu bar into account, and use it for the initial
enter fullscreen animation.

* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController enterFullScreen:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformScreenh">trunk/Source/WebCore/platform/PlatformScreen.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformScreenMacmm">trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessmacWKFullScreenWindowControllermm">trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (280975 => 280976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-12 19:13:00 UTC (rev 280975)
+++ trunk/Source/WebCore/ChangeLog      2021-08-12 19:16:04 UTC (rev 280976)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-08-12  Jer Noble  <jer.noble@apple.com>
+
+        [macOS] Enter fullscreen animation interferes with auto-hiding menu bar
+        https://bugs.webkit.org/show_bug.cgi?id=229039
+        <rdar://79150656>
+
+        Reviewed by Eric Carlson.
+
+        Add a new utility method to calculate the available screen rect taking menu bar
+        hiding into account.
+
+        * platform/PlatformScreen.h:
+        * platform/mac/PlatformScreenMac.mm:
+        (WebCore::screenRectAvoidingMenuBar):
+
</ins><span class="cx"> 2021-08-12  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix some `NSAttributedString` inconsistencies between WK1 and WK2
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformScreenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformScreen.h (280975 => 280976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformScreen.h   2021-08-12 19:13:00 UTC (rev 280975)
+++ trunk/Source/WebCore/platform/PlatformScreen.h      2021-08-12 19:16:04 UTC (rev 280976)
</span><span class="lines">@@ -117,6 +117,7 @@
</span><span class="cx"> 
</span><span class="cx"> FloatRect screenRectForDisplay(PlatformDisplayID);
</span><span class="cx"> WEBCORE_EXPORT FloatRect screenRectForPrimaryScreen();
</span><ins>+WEBCORE_EXPORT FloatRect availableScreenRect(NSScreen *);
</ins><span class="cx"> 
</span><span class="cx"> WEBCORE_EXPORT FloatRect toUserSpace(const NSRect&, NSWindow *destination);
</span><span class="cx"> WEBCORE_EXPORT FloatRect toUserSpaceForPrimaryScreen(const NSRect&);
</span><span class="lines">@@ -133,6 +134,8 @@
</span><span class="cx"> IORegistryGPUID gpuIDForDisplay(PlatformDisplayID);
</span><span class="cx"> IORegistryGPUID gpuIDForDisplayMask(uint32_t);
</span><span class="cx"> 
</span><ins>+WEBCORE_EXPORT FloatRect screenRectAvoidingMenuBar(NSScreen *);
+
</ins><span class="cx"> #endif // !PLATFORM(MAC)
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformScreenMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm (280975 => 280976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm   2021-08-12 19:13:00 UTC (rev 280975)
+++ trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm      2021-08-12 19:16:04 UTC (rev 280976)
</span><span class="lines">@@ -44,6 +44,10 @@
</span><span class="cx"> #import <pal/cocoa/MediaToolboxSoftLink.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PlatformScreenIOS.mm>)
+#import <WebKitAdditions/PlatformScreenMac.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> // These functions scale between screen and page coordinates because JavaScript/DOM operations
</span><span class="lines">@@ -415,6 +419,16 @@
</span><span class="cx">     return flippedPoint;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PlatformScreenIOS.mm>)
+#import <WebKitAdditions/PlatformScreenMac.mm>
+#else
+FloatRect screenRectAvoidingMenuBar(NSScreen* screen)
+{
+    return screen.frame;
+}
+#endif
+
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (280975 => 280976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-12 19:13:00 UTC (rev 280975)
+++ trunk/Source/WebKit/ChangeLog       2021-08-12 19:16:04 UTC (rev 280976)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-08-12  Jer Noble  <jer.noble@apple.com>
+
+        [macOS] Enter fullscreen animation interferes with auto-hiding menu bar
+        https://bugs.webkit.org/show_bug.cgi?id=229039
+        <rdar://79150656>
+
+        Reviewed by Eric Carlson.
+
+        When entering fullscreen, if a user has unchecked the "auto-hide menu bar in fullscreen"
+        setting, the fullscreen animation will enter to the full screen frame, then snap down once
+        the animation completes to reveal the menu bar. Instead, use a WebCore utility method to
+        calculate the screen's frame taking that menu bar into account, and use it for the initial
+        enter fullscreen animation.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController enterFullScreen:]):
+
</ins><span class="cx"> 2021-08-12  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix some `NSAttributedString` inconsistencies between WK1 and WK2
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessmacWKFullScreenWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm (280975 => 280976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm        2021-08-12 19:13:00 UTC (rev 280975)
+++ trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm   2021-08-12 19:16:04 UTC (rev 280976)
</span><span class="lines">@@ -227,8 +227,8 @@
</span><span class="cx"> 
</span><span class="cx">     if (!screen)
</span><span class="cx">         screen = [NSScreen mainScreen];
</span><del>-    NSRect screenFrame = [screen frame];
</del><span class="cx"> 
</span><ins>+    NSRect screenFrame = WebCore::screenRectAvoidingMenuBar(screen);
</ins><span class="cx">     NSRect webViewFrame = convertRectToScreen([_webView window], [_webView convertRect:[_webView frame] toView:nil]);
</span><span class="cx"> 
</span><span class="cx">     // Flip coordinate system:
</span></span></pre>
</div>
</div>

</body>
</html>