<!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>[171397] branches/safari-600.1-branch</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/171397">171397</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-07-22 22:05:13 -0700 (Tue, 22 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171184">r171184</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchLayoutTestsplatformmacfasthidpivideocontrolsinhidpiexpectedtxt">branches/safari-600.1-branch/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsplatformmacfastlayersvideolayerexpectedtxt">branches/safari-600.1-branch/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsplatformmacmediamediacontrolscloneexpectedtxt">branches/safari-600.1-branch/LayoutTests/platform/mac/media/media-controls-clone-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsplatformmacwebarchiveloadingvideoinwebarchiveexpectedtxt">branches/safari-600.1-branch/LayoutTests/platform/mac/webarchive/loading/video-in-webarchive-expected.txt</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (171396 => 171397)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog        2014-07-23 04:58:31 UTC (rev 171396)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog        2014-07-23 05:05:13 UTC (rev 171397)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-07-22 Dana Burkart &lt;dburkart@apple.com&gt;
+    
+        Merge r171184.
+
+    2014-07-17  Jer Noble  &lt;jer.noble@apple.com&gt;
+
+            Enable legacy fullscreen API in media controls
+            https://bugs.webkit.org/show_bug.cgi?id=134985
+
+            Reviewed by Eric Carlson.
+
+            Rebaseline expected results.
+
+            * platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt:
+            * platform/mac/fast/layers/video-layer-expected.txt:
+            * platform/mac/media/media-controls-clone-expected.txt:
+            * platform/mac/webarchive/loading/video-in-webarchive-expected.txt:
+
</ins><span class="cx"> 2014-07-16  Carlos Alberto Lopez Perez  &lt;clopez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Unreviewed GTK gardening.
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsplatformmacfasthidpivideocontrolsinhidpiexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt (171396 => 171397)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt        2014-07-23 04:58:31 UTC (rev 171396)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt        2014-07-23 05:05:13 UTC (rev 171397)
</span><span class="lines">@@ -18,9 +18,7 @@
</span><span class="cx">   RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,156) size 16x16
</span><span class="cx">   RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
</span><del>-layer at (180,160) size 98x9
-  RenderFlexibleBox {DIV} at (171,8) size 99x10
-layer at (182,160) size 95x9
-  RenderFlexibleBox {DIV} at (2,0) size 95x9
-layer at (285,156) size 16x16
-  RenderButton {BUTTON} at (277,5) size 16x16 [color=#FFFFFF]
</del><ins>+layer at (195,160) size 113x9
+  RenderFlexibleBox {DIV} at (186,8) size 114x10
+layer at (197,160) size 110x9
+  RenderFlexibleBox {DIV} at (2,0) size 110x9
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsplatformmacfastlayersvideolayerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt (171396 => 171397)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt        2014-07-23 04:58:31 UTC (rev 171396)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt        2014-07-23 05:05:13 UTC (rev 171397)
</span><span class="lines">@@ -23,9 +23,7 @@
</span><span class="cx">   RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (91,241) size 16x16
</span><span class="cx">   RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
</span><del>-layer at (231,245) size 98x9
-  RenderFlexibleBox {DIV} at (171,8) size 99x10
-layer at (233,245) size 95x9
-  RenderFlexibleBox {DIV} at (2,0) size 95x9
-layer at (336,241) size 16x16
-  RenderButton {BUTTON} at (277,5) size 16x16 [color=#FFFFFF]
</del><ins>+layer at (246,245) size 113x9
+  RenderFlexibleBox {DIV} at (186,8) size 114x10
+layer at (248,245) size 110x9
+  RenderFlexibleBox {DIV} at (2,0) size 110x9
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsplatformmacmediamediacontrolscloneexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/platform/mac/media/media-controls-clone-expected.txt (171396 => 171397)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/platform/mac/media/media-controls-clone-expected.txt        2014-07-23 04:58:31 UTC (rev 171396)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/media/media-controls-clone-expected.txt        2014-07-23 05:05:13 UTC (rev 171397)
</span><span class="lines">@@ -19,12 +19,10 @@
</span><span class="cx">   RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,138) size 16x16
</span><span class="cx">   RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
</span><del>-layer at (180,142) size 98x9
-  RenderFlexibleBox {DIV} at (171,8) size 99x10
-layer at (182,142) size 95x9
-  RenderFlexibleBox {DIV} at (2,0) size 95x9
-layer at (285,138) size 16x16
-  RenderButton {BUTTON} at (277,5) size 16x16 [color=#FFFFFF]
</del><ins>+layer at (195,142) size 113x9
+  RenderFlexibleBox {DIV} at (186,8) size 114x10
+layer at (197,142) size 110x9
+  RenderFlexibleBox {DIV} at (2,0) size 110x9
</ins><span class="cx"> layer at (308,133) size 200x25
</span><span class="cx">   RenderFlexibleBox {DIV} at (0,0) size 200x25
</span><span class="cx"> layer at (308,133) size 200x25
</span><span class="lines">@@ -45,12 +43,10 @@
</span><span class="cx">   RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,292) size 16x16
</span><span class="cx">   RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
</span><del>-layer at (180,296) size 98x9
-  RenderFlexibleBox {DIV} at (171,8) size 99x10
-layer at (182,296) size 95x9
-  RenderFlexibleBox {DIV} at (2,0) size 95x9
-layer at (285,292) size 16x16
-  RenderButton {BUTTON} at (277,5) size 16x16 [color=#FFFFFF]
</del><ins>+layer at (195,296) size 113x9
+  RenderFlexibleBox {DIV} at (186,8) size 114x10
+layer at (197,296) size 110x9
+  RenderFlexibleBox {DIV} at (2,0) size 110x9
</ins><span class="cx"> layer at (308,287) size 200x25
</span><span class="cx">   RenderFlexibleBox {DIV} at (0,0) size 200x25
</span><span class="cx"> layer at (308,287) size 200x25
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsplatformmacwebarchiveloadingvideoinwebarchiveexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/platform/mac/webarchive/loading/video-in-webarchive-expected.txt (171396 => 171397)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/platform/mac/webarchive/loading/video-in-webarchive-expected.txt        2014-07-23 04:58:31 UTC (rev 171396)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/webarchive/loading/video-in-webarchive-expected.txt        2014-07-23 05:05:13 UTC (rev 171397)
</span><span class="lines">@@ -11,6 +11,6 @@
</span><span class="cx"> frame &quot;&lt;!--framePath //&lt;!--frame0--&gt;--&gt;&quot; - didCommitLoadForFrame
</span><span class="cx"> frame &quot;&lt;!--framePath //&lt;!--frame0--&gt;--&gt;&quot; - didFinishDocumentLoadForFrame
</span><span class="cx"> frame &quot;&lt;!--framePath //&lt;!--frame0--&gt;--&gt;&quot; - didFailLoadWithError
</span><del>-main frame &quot;webkitfullscreenchange&quot; - didFinishLoadForFrame
</del><ins>+main frame &quot;webkitendfullscreen&quot; - didFinishLoadForFrame
</ins><span class="cx"> frame &quot;&lt;!--framePath //&lt;!--frame0--&gt;--&gt;&quot; - didHandleOnloadEventsForFrame
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171396 => 171397)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog        2014-07-23 04:58:31 UTC (rev 171396)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog        2014-07-23 05:05:13 UTC (rev 171397)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-07-22 Dana Burkart &lt;dburkart@apple.com&gt;
</span><span class="cx">     
</span><ins>+        Merge r171184.
+
+    2014-07-17  Jer Noble  &lt;jer.noble@apple.com&gt;
+
+            Enable legacy fullscreen API in media controls
+            https://bugs.webkit.org/show_bug.cgi?id=134985
+
+            Reviewed by Eric Carlson.
+
+            Allow clients who have not enabled HTML5 Fullscreen APIs to still use fullscreen mode
+            with &lt;video&gt; elements by using the legacy, video-element-specific fullscreen APIs in
+            the &lt;video&gt; media controls.
+
+            * Modules/mediacontrols/mediaControlsApple.js:
+            (Controller):
+            (Controller.prototype.handleReadyStateChange):
+            (Controller.prototype.isFullScreen):
+            (Controller.prototype.handlePlayButtonClicked):
+            (Controller.prototype.updateFullscreenButton):
+            (Controller.prototype.handleFullscreenButtonClicked):
+
+2014-07-22 Dana Burkart &lt;dburkart@apple.com&gt;
+    
</ins><span class="cx">         Merge r171376.
</span><span class="cx"> 
</span><span class="cx">     2014-07-22  Tim Horton  &lt;timothy_horton@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (171396 => 171397)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js        2014-07-23 04:58:31 UTC (rev 171396)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js        2014-07-23 05:05:13 UTC (rev 171397)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx">     this.updateThumbnail();
</span><span class="cx">     this.updateCaptionButton();
</span><span class="cx">     this.updateCaptionContainer();
</span><ins>+    this.updateFullscreenButton();
</ins><span class="cx">     this.updateVolume();
</span><span class="cx">     this.updateHasAudio();
</span><span class="cx">     this.updateHasVideo();
</span><span class="lines">@@ -63,6 +64,8 @@
</span><span class="cx">         progress: 'handleProgress',
</span><span class="cx">         volumechange: 'handleVolumeChange',
</span><span class="cx">         webkitfullscreenchange: 'handleFullscreenChange',
</span><ins>+        webkitbeginfullscreen: 'handleFullscreenChange',
+        webkitendfullscreen: 'handleFullscreenChange',
</ins><span class="cx">     },
</span><span class="cx">     HideControlsDelay: 4 * 1000,
</span><span class="cx">     RewindAmount: 30,
</span><span class="lines">@@ -552,6 +555,7 @@
</span><span class="cx">         this.updateDuration();
</span><span class="cx">         this.updateCaptionButton();
</span><span class="cx">         this.updateCaptionContainer();
</span><ins>+        this.updateFullscreenButton();
</ins><span class="cx">         this.updateProgress();
</span><span class="cx">     },
</span><span class="cx"> 
</span><span class="lines">@@ -614,7 +618,7 @@
</span><span class="cx"> 
</span><span class="cx">     isFullScreen: function()
</span><span class="cx">     {
</span><del>-        return document.webkitCurrentFullScreenElement === this.video;
</del><ins>+        return this.video.webkitDisplayingFullscreen;
</ins><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     handleFullscreenChange: function(event)
</span><span class="lines">@@ -827,12 +831,17 @@
</span><span class="cx">         return true;
</span><span class="cx">     },
</span><span class="cx"> 
</span><ins>+    updateFullscreenButton: function()
+    {
+        this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, !this.video.webkitSupportsFullscreen);
+    },
+
</ins><span class="cx">     handleFullscreenButtonClicked: function(event)
</span><span class="cx">     {
</span><span class="cx">         if (this.isFullScreen())
</span><del>-            document.webkitExitFullscreen();
</del><ins>+            this.video.webkitExitFullscreen();
</ins><span class="cx">         else
</span><del>-            this.video.webkitRequestFullscreen();
</del><ins>+            this.video.webkitEnterFullscreen();
</ins><span class="cx">         return true;
</span><span class="cx">     },
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>