<!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>[212436] branches/safari-603-branch/Source/WebKit2</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/212436">212436</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 09:17:18 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212398">r212398</a>. rdar://problem/29906848</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessmacWKFullScreenWindowControllermm">branches/safari-603-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212435 => 212436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog        2017-02-16 17:11:05 UTC (rev 212435)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog        2017-02-16 17:17:18 UTC (rev 212436)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r212398. rdar://problem/29906848
+
+ 2017-02-15 Jer Noble <jer.noble@apple.com>
+
+ REGRESSION(r183937): Fullscreen Exit animation missing mask
+ https://bugs.webkit.org/show_bug.cgi?id=168360
+
+ Reviewed by Eric Carlson.
+
+ In r183937, the fullscreen window's clip layer has it's mask removed when the enter
+ fullscreen animation completes, allowing low-power video playback mode to be entered. But
+ this breaks the exit fullscreen animaiton, which assumes a mask is present. Abstract the
+ mask creation code out into a static helper method, and use it at the beginning of the exit
+ fullscreen animation to re-create the mask before adding animations to it.
+
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (createMask):
+ (-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
+ (-[WKFullScreenWindowController _startExitFullScreenAnimationWithDuration:]):
+
</ins><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Roll out r209845. rdar://problem/30114564
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessmacWKFullScreenWindowControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (212435 => 212436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm        2017-02-16 17:11:05 UTC (rev 212435)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm        2017-02-16 17:17:18 UTC (rev 212436)
</span><span class="lines">@@ -556,6 +556,16 @@
</span><span class="cx"> return scaleAnimation;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static CALayer *createMask(const FloatRect& bounds)
+{
+ CALayer *maskLayer = [CALayer layer];
+ maskLayer.anchorPoint = CGPointZero;
+ maskLayer.frame = bounds;
+ maskLayer.backgroundColor = CGColorGetConstantColor(kCGColorBlack);
+ maskLayer.autoresizingMask = (NSViewWidthSizable | NSViewHeightSizable);
+ return maskLayer;
+}
+
</ins><span class="cx"> static CAAnimation *maskAnimation(const FloatRect& initialFrame, const FloatRect& finalFrame, const FloatRect& screenFrame, CFTimeInterval duration, AnimationDirection direction)
</span><span class="cx"> {
</span><span class="cx"> CABasicAnimation *boundsAnimation = [CABasicAnimation animationWithKeyPath:@"bounds"];
</span><span class="lines">@@ -601,11 +611,7 @@
</span><span class="cx"> NSView* contentView = [[self window] contentView];
</span><span class="cx">
</span><span class="cx"> [[_clipView layer] addAnimation:zoomAnimation(_initialFrame, _finalFrame, self.window.screen.frame, duration, AnimateIn) forKey:@"fullscreen"];
</span><del>- CALayer *maskLayer = [CALayer layer];
- maskLayer.anchorPoint = CGPointZero;
- maskLayer.frame = NSRectToCGRect(contentView.bounds);
- maskLayer.backgroundColor = CGColorGetConstantColor(kCGColorBlack);
- maskLayer.autoresizingMask = (NSViewWidthSizable | NSViewHeightSizable);
</del><ins>+ CALayer *maskLayer = createMask(contentView.bounds);
</ins><span class="cx"> [maskLayer addAnimation:maskAnimation(_initialFrame, _finalFrame, self.window.screen.frame, duration, AnimateIn) forKey:@"fullscreen"];
</span><span class="cx"> [_clipView layer].mask = maskLayer;
</span><span class="cx">
</span><span class="lines">@@ -636,9 +642,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [[_clipView layer] addAnimation:zoomAnimation(_initialFrame, _finalFrame, self.window.screen.frame, duration, AnimateOut) forKey:@"fullscreen"];
</span><del>- [[_clipView layer].mask addAnimation:maskAnimation(_initialFrame, _finalFrame, self.window.screen.frame, duration, AnimateOut) forKey:@"fullscreen"];
</del><ins>+ NSView* contentView = [[self window] contentView];
+ CALayer *maskLayer = createMask(contentView.bounds);
+ [maskLayer addAnimation:maskAnimation(_initialFrame, _finalFrame, self.window.screen.frame, duration, AnimateOut) forKey:@"fullscreen"];
+ [_clipView layer].mask = maskLayer;
</ins><span class="cx">
</span><del>- NSView* contentView = [[self window] contentView];
</del><span class="cx"> contentView.hidden = NO;
</span><span class="cx"> [_backgroundView.get().layer addAnimation:fadeAnimation(duration, AnimateOut) forKey:@"fullscreen"];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>