<!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>[179689] trunk/Source/WebCore</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/179689">179689</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-02-05 05:34:41 -0800 (Thu, 05 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Media iOS] Add a debug setting to always show the optimized fullscreen button
https://bugs.webkit.org/show_bug.cgi?id=141277
<rdar://problem/19724471>
Reviewed by Eric Carlson.
Add a debug option so that we can test the optimized fullscreen
control on media that doesn't support it.
* Modules/mediacontrols/mediaControlsiOS.js: Add gSimulateOptimizedFullscreenAvailable.
(ControllerIOS.prototype.createControls): Check the setting.
(ControllerIOS.prototype.configureInlineControls): Ditto.
(ControllerIOS.prototype.formatTime): Drive-by whitespace cleanup.
(ControllerIOS.prototype.handleBaseGestureChange):
(ControllerIOS.prototype.handleWrapperTouchStart):
(ControllerIOS.prototype.handleOptimizedFullscreenTouchEnd):
(ControllerIOS.prototype.handlePresentationModeChange): Drive-by variable renaming.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179688 => 179689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-05 13:02:26 UTC (rev 179688)
+++ trunk/Source/WebCore/ChangeLog 2015-02-05 13:34:41 UTC (rev 179689)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-02-04 Dean Jackson <dino@apple.com>
+
+ [Media iOS] Add a debug setting to always show the optimized fullscreen button
+ https://bugs.webkit.org/show_bug.cgi?id=141277
+ <rdar://problem/19724471>
+
+ Reviewed by Eric Carlson.
+
+ Add a debug option so that we can test the optimized fullscreen
+ control on media that doesn't support it.
+
+ * Modules/mediacontrols/mediaControlsiOS.js: Add gSimulateOptimizedFullscreenAvailable.
+ (ControllerIOS.prototype.createControls): Check the setting.
+ (ControllerIOS.prototype.configureInlineControls): Ditto.
+ (ControllerIOS.prototype.formatTime): Drive-by whitespace cleanup.
+ (ControllerIOS.prototype.handleBaseGestureChange):
+ (ControllerIOS.prototype.handleWrapperTouchStart):
+ (ControllerIOS.prototype.handleOptimizedFullscreenTouchEnd):
+ (ControllerIOS.prototype.handlePresentationModeChange): Drive-by variable renaming.
+
</ins><span class="cx"> 2015-02-05 Youenn Fablet <youenn.fablet@crf.canon.fr> and Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Implement a barebone ReadableStream interface
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (179688 => 179689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-02-05 13:02:26 UTC (rev 179688)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-02-05 13:34:41 UTC (rev 179689)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> /* Globals */
</span><span class="cx"> ControllerIOS.gWirelessImage = 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 245"><g fill="#1060FE"><path d="M193.6,6.3v121.6H6.4V6.3H193.6 M199.1,0.7H0.9v132.7h198.2V0.7L199.1,0.7z"/><path d="M43.5,139.3c15.8,8,35.3,12.7,56.5,12.7s40.7-4.7,56.5-12.7H43.5z"/></g><g text-anchor="middle" font-family="Helvetica Neue"><text x="100" y="204" fill="white" font-size="24">##DEVICE_TYPE##</text><text x="100" y="234" fill="#5C5C5C" font-size="21">##DEVICE_NAME##</text></g></svg>';
</span><span class="cx"> ControllerIOS.gSimulateWirelessPlaybackTarget = false; // Used for testing when there are no wireless targets.
</span><ins>+ControllerIOS.gSimulateOptimizedFullscreenAvailable = false; // Used for testing when optimized fullscreen is not available.
</ins><span class="cx">
</span><span class="cx"> ControllerIOS.prototype = {
</span><span class="cx"> addVideoListeners: function() {
</span><span class="lines">@@ -150,7 +151,8 @@
</span><span class="cx">
</span><span class="cx"> var inlinePlaybackPlaceholder = this.controls.inlinePlaybackPlaceholder = document.createElement('div');
</span><span class="cx"> inlinePlaybackPlaceholder.setAttribute('pseudo', '-webkit-media-controls-inline-playback-placeholder');
</span><del>- inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
</del><ins>+ if (!ControllerIOS.gSimulateOptimizedFullscreenAvailable)
+ inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
</ins><span class="cx"> inlinePlaybackPlaceholder.setAttribute('aria-label', this.UIString('Display Optimized Full Screen'));
</span><span class="cx">
</span><span class="cx"> var wirelessTargetPicker = this.controls.wirelessTargetPicker = document.createElement('button');
</span><span class="lines">@@ -223,7 +225,7 @@
</span><span class="cx"> this.controls.timelineBox.appendChild(this.controls.remainingTime);
</span><span class="cx"> }
</span><span class="cx"> if (!this.isAudio()) {
</span><del>- if ('webkitSupportsPresentationMode' in this.video && this.video.webkitSupportsPresentationMode('optimized'))
</del><ins>+ if (ControllerIOS.gSimulateOptimizedFullscreenAvailable || ('webkitSupportsPresentationMode' in this.video && this.video.webkitSupportsPresentationMode('optimized')))
</ins><span class="cx"> this.controls.panel.appendChild(this.controls.optimizedFullscreenButton);
</span><span class="cx"> this.controls.panel.appendChild(this.controls.fullscreenButton);
</span><span class="cx"> }
</span><span class="lines">@@ -342,7 +344,7 @@
</span><span class="cx"> handleBaseGestureChange: function(event) {
</span><span class="cx"> if (!this.video.controls || this.isAudio() || this.isFullScreen() || this.gestureStartTime === undefined || this.controlsType == ControllerIOS.StartPlaybackControls)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> var scaleDetectionThreshold = 0.2;
</span><span class="cx"> if (event.scale > 1 + scaleDetectionThreshold || event.scale < 1 - scaleDetectionThreshold)
</span><span class="cx"> delete this.lastDoubleTouchTime;
</span><span class="lines">@@ -356,7 +358,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var velocity = Math.abs(event.scale - 1) / duration;
</span><del>-
</del><ins>+
</ins><span class="cx"> var pinchOutVelocityThreshold = 2;
</span><span class="cx"> var pinchOutGestureScaleThreshold = 1.25;
</span><span class="cx"> if (velocity < pinchOutVelocityThreshold || event.scale < pinchOutGestureScaleThreshold)
</span><span class="lines">@@ -375,7 +377,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.mostRecentNumberOfTargettedTouches = event.targetTouches.length;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (this.controlsAreHidden()) {
</span><span class="cx"> this.showControls();
</span><span class="cx"> if (this.hideTimer)
</span><span class="lines">@@ -458,19 +460,19 @@
</span><span class="cx"> else
</span><span class="cx"> this.video.webkitSetPresentationMode('optimized');
</span><span class="cx"> },
</span><del>-
</del><ins>+
</ins><span class="cx"> handleOptimizedFullscreenTouchStart: function() {
</span><span class="cx"> this.controls.optimizedFullscreenButton.classList.add('active');
</span><span class="cx"> },
</span><del>-
</del><ins>+
</ins><span class="cx"> handleOptimizedFullscreenTouchEnd: function(event) {
</span><span class="cx"> this.controls.optimizedFullscreenButton.classList.remove('active');
</span><del>-
</del><ins>+
</ins><span class="cx"> this.handleOptimizedFullscreenButtonClicked();
</span><del>-
</del><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> },
</span><del>-
</del><ins>+
</ins><span class="cx"> handleOptimizedFullscreenTouchCancel: function(event) {
</span><span class="cx"> this.controls.optimizedFullscreenButton.classList.remove('active');
</span><span class="cx"> return true;
</span><span class="lines">@@ -612,8 +614,8 @@
</span><span class="cx"> this.controls.inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
</span><span class="cx"> break;
</span><span class="cx"> case 'optimized':
</span><del>- var backgroundImageSVG = "url('" + this.host.mediaUIImageData("optimized-fullscreen-placeholder") + "')";
- this.controls.inlinePlaybackPlaceholder.style.backgroundImage = backgroundImageSVG;
</del><ins>+ var backgroundImage = "url('" + this.host.mediaUIImageData("optimized-fullscreen-placeholder") + "')";
+ this.controls.inlinePlaybackPlaceholder.style.backgroundImage = backgroundImage;
</ins><span class="cx"> this.controls.inlinePlaybackPlaceholder.setAttribute('aria-label', "video playback placeholder");
</span><span class="cx"> this.controls.inlinePlaybackPlaceholder.classList.remove(this.ClassNames.hidden);
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>