<!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>[175596] 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/175596">175596</a></dd>
<dt>Author</dt> <dd>jeremyj-wk@apple.com</dd>
<dt>Date</dt> <dd>2014-11-04 17:36:42 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add button and enable optimized fullscreen.
https://bugs.webkit.org/show_bug.cgi?id=138351
Reviewed by Eric Carlson.
Added optimizedFullscreenButton to js media element controls. Remove #if conditional
and use optimizedFullscreenSupported to enable feature at runtime
* Modules/mediacontrols/MediaControlsHost.cpp:
(WebCore::MediaControlsHost::enterFullscreenOptimized): enable
(WebCore::MediaControlsHost::optimizedFullscreenSupported): added
* Modules/mediacontrols/MediaControlsHost.h: add optimizedFullscreenSupported
* Modules/mediacontrols/MediaControlsHost.idl: ditto
* Modules/mediacontrols/mediaControlsApple.css:
(audio::-webkit-media-controls-optimized-fullscreen-button): added
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.createControls): add button
(Controller.prototype.handleReadyStateChange): update button
(Controller.prototype.updateOptimizedFullscreenButton): added
* Modules/mediacontrols/mediaControlsiOS.css:
(audio::-webkit-media-controls-optimized-fullscreen-button): added
(video::-webkit-media-controls-optimized-fullscreen-button): added
(video::-webkit-media-controls-optimized-fullscreen-button:active): added
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.createControls): listen for events from optimizedFullscreenButton
(ControllerIOS.prototype.configureInlineControls): add button for non-audio when supported.
(ControllerIOS.prototype.handleBaseGestureChange): 2-finger double-tap gesture for optimized fullscreen
(ControllerIOS.prototype.handleWrapperTouchStart): ditto
(ControllerIOS.prototype.handleOptimizedFullscreenButtonClicked): added
(ControllerIOS.prototype.handleOptimizedFullscreenTouchStart): added
(ControllerIOS.prototype.handleOptimizedFullscreenTouchEnd): added
(ControllerIOS.prototype.handleOptimizedFullscreenTouchCancel): added
(ControllerIOS.prototype.handleStartPlaybackButtonTouchStart): fix typo
(ControllerIOS.prototype.handleStartPlaybackButtonTouchEnd): fix typo
(ControllerIOS.prototype.handleStartPlaybackButtonTouchCancel): fix typo
* WebCore.exp.in:
* platform/ios/WebCoreSystemInterfaceIOS.h: added wkIsOptimizedFullscreenSupported
* platform/ios/WebCoreSystemInterfaceIOS.mm: added wkIsOptimizedFullscreenSupported
* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(WebVideoFullscreenInterfaceAVKit::enterFullscreen): enable feature
(WebVideoFullscreenInterfaceAVKit::exitFullscreen): enable feature
(WebVideoFullscreenInterfaceAVKit::cleanupFullscreen): only request exit when entered and not requested exit
(WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen): ditto
* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): added
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface): add IsOptimizedFullscreenSupported</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojmediaControlsLocalizedStringsjs">trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSh">trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm">trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm">trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/ChangeLog 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2014-11-03 Jeremy Jones <jeremyj@apple.com>
+
+ Add button and enable optimized fullscreen.
+ https://bugs.webkit.org/show_bug.cgi?id=138351
+
+ Reviewed by Eric Carlson.
+
+ Added optimizedFullscreenButton to js media element controls. Remove #if conditional
+ and use optimizedFullscreenSupported to enable feature at runtime
+
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::enterFullscreenOptimized): enable
+ (WebCore::MediaControlsHost::optimizedFullscreenSupported): added
+ * Modules/mediacontrols/MediaControlsHost.h: add optimizedFullscreenSupported
+ * Modules/mediacontrols/MediaControlsHost.idl: ditto
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-controls-optimized-fullscreen-button): added
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.createControls): add button
+ (Controller.prototype.handleReadyStateChange): update button
+ (Controller.prototype.updateOptimizedFullscreenButton): added
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (audio::-webkit-media-controls-optimized-fullscreen-button): added
+ (video::-webkit-media-controls-optimized-fullscreen-button): added
+ (video::-webkit-media-controls-optimized-fullscreen-button:active): added
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.createControls): listen for events from optimizedFullscreenButton
+ (ControllerIOS.prototype.configureInlineControls): add button for non-audio when supported.
+ (ControllerIOS.prototype.handleBaseGestureChange): 2-finger double-tap gesture for optimized fullscreen
+ (ControllerIOS.prototype.handleWrapperTouchStart): ditto
+ (ControllerIOS.prototype.handleOptimizedFullscreenButtonClicked): added
+ (ControllerIOS.prototype.handleOptimizedFullscreenTouchStart): added
+ (ControllerIOS.prototype.handleOptimizedFullscreenTouchEnd): added
+ (ControllerIOS.prototype.handleOptimizedFullscreenTouchCancel): added
+ (ControllerIOS.prototype.handleStartPlaybackButtonTouchStart): fix typo
+ (ControllerIOS.prototype.handleStartPlaybackButtonTouchEnd): fix typo
+ (ControllerIOS.prototype.handleStartPlaybackButtonTouchCancel): fix typo
+ * WebCore.exp.in:
+ * platform/ios/WebCoreSystemInterfaceIOS.h: added wkIsOptimizedFullscreenSupported
+ * platform/ios/WebCoreSystemInterfaceIOS.mm: added wkIsOptimizedFullscreenSupported
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::enterFullscreen): enable feature
+ (WebVideoFullscreenInterfaceAVKit::exitFullscreen): enable feature
+ (WebVideoFullscreenInterfaceAVKit::cleanupFullscreen): only request exit when entered and not requested exit
+ (WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen): ditto
+
</ins><span class="cx"> 2014-11-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Pause on exceptions should show the actual exception
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojmediaControlsLocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> 'Captions': 'Captions',
</span><span class="cx"> 'Choose Wireless Display': 'Choose Wireless Display',
</span><span class="cx"> 'Display Full Screen': 'Display Full Screen',
</span><ins>+ 'Display Optimized Full Screen': 'Display Optimized Full Screen',
</ins><span class="cx"> 'Duration': 'Duration',
</span><span class="cx"> 'Elapsed': 'Elapsed',
</span><span class="cx"> 'Error': 'Error',
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -190,10 +190,19 @@
</span><span class="cx">
</span><span class="cx"> void MediaControlsHost::enterFullscreenOptimized()
</span><span class="cx"> {
</span><del>-#if ENABLE(OPTIMIZED_FULLSCREEN)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> m_mediaElement->enterFullscreenOptimized();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+bool MediaControlsHost::optimizedFullscreenSupported()
+{
+#if PLATFORM(IOS)
+ return wkIsOptimizedFullscreenSupported();
+#else
+ return false;
+#endif
+}
</ins><span class="cx">
</span><span class="cx"> void MediaControlsHost::updateCaptionDisplaySizes()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> void enteredFullscreen();
</span><span class="cx"> void exitedFullscreen();
</span><span class="cx"> void enterFullscreenOptimized();
</span><ins>+ bool optimizedFullscreenSupported();
</ins><span class="cx">
</span><span class="cx"> String externalDeviceDisplayName() const;
</span><span class="cx"> String externalDeviceType() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -56,4 +56,5 @@
</span><span class="cx"> void enteredFullscreen();
</span><span class="cx"> void exitedFullscreen();
</span><span class="cx"> void enterFullscreenOptimized();
</span><ins>+ readonly attribute boolean optimizedFullscreenSupported;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -389,6 +389,11 @@
</span><span class="cx"> audio::-webkit-media-controls-fullscreen-button.exit {
</span><span class="cx"> background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" transform="rotate(90,0,0)"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(200, 200, 200)"/><stop offset="1" stop-color="rgb(208, 208, 208)"/></linearGradient><path d="M 7,8 m 0,6 -2,-2 -2,2 c 0,0 -1,1 -2,0 -1,-1 0,-2 0,-2 l 2,-2 -2,-2 6,0 z" style="fill:url(#gradient) "/><path d="M 8,7 m 0,-6 2,2 2,-2
c 0,0 1,-1 2,0 1,1 0,2 0,2 l -2,2 2,2 -6,0 z" style="fill:url(#gradient) "/></svg>');
</span><span class="cx"> }
</span><ins>+video::-webkit-media-controls-optimized-fullscreen-button,
+audio::-webkit-media-controls-optimized-fullscreen-button {
+ background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" transform="rotate(90,0,0)"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(200, 200, 200)"/><stop offset="1" stop-color="rgb(208, 208, 208)"/></linearGradient><path d="M 7,8 m 0,6 -2,-2 -2,2 c 0,0 -1,1 -2,0 -1,-1 0,-2 0,-2 l 2,-2 -2,-2 6,0 z" style="fill:url(#gradient) "/><path d="M 8,7 m 0,-6 2,2 2,-2 c 0,0 1,-1 2,0 1,1 0,2 0
,2 l -2,2 2,2 -6,0 z" style="fill:url(#gradient) "/></svg>');
+ margin: 0 7px;
+}
</ins><span class="cx"> video::-webkit-media-controls-status-display,
</span><span class="cx"> audio::-webkit-media-controls-status-display {
</span><span class="cx"> cursor: default;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -395,6 +395,11 @@
</span><span class="cx"> fullscreenButton.setAttribute('pseudo', '-webkit-media-controls-fullscreen-button');
</span><span class="cx"> fullscreenButton.setAttribute('aria-label', this.UIString('Display Full Screen'));
</span><span class="cx"> this.listenFor(fullscreenButton, 'click', this.handleFullscreenButtonClicked);
</span><ins>+
+ var optimizedFullscreenButton = this.controls.optimizedFullscreenButton = document.createElement('button');
+ optimizedFullscreenButton.setAttribute('pseudo', '-webkit-media-controls-optimized-fullscreen-button');
+ optimizedFullscreenButton.setAttribute('aria-label', this.UIString('Display Optimized Full Screen'));
+ this.listenFor(optimizedFullscreenButton, 'click', this.handleOptimizedFullscreenButtonClicked);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setControlsType: function(type)
</span><span class="lines">@@ -554,6 +559,7 @@
</span><span class="cx"> this.updateCaptionButton();
</span><span class="cx"> this.updateCaptionContainer();
</span><span class="cx"> this.updateFullscreenButton();
</span><ins>+ this.updateOptimizedFullscreenButton();
</ins><span class="cx"> this.updateProgress();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -859,6 +865,11 @@
</span><span class="cx"> this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, !this.video.webkitSupportsFullscreen);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ updateOptimizedFullscreenButton: function()
+ {
+ this.controls.optimizedFullscreenButton.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></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -209,7 +209,9 @@
</span><span class="cx"> video::-webkit-media-controls-play-button,
</span><span class="cx"> audio::-webkit-media-controls-play-button,
</span><span class="cx"> video::-webkit-media-controls-fullscreen-button,
</span><del>-audio::-webkit-media-controls-fullscreen-button {
</del><ins>+audio::-webkit-media-controls-fullscreen-button,
+video::-webkit-media-controls-optimized-fullscreen-button,
+audio::-webkit-media-controls-optimized-fullscreen-button {
</ins><span class="cx"> -webkit-appearance: none;
</span><span class="cx"> display: block;
</span><span class="cx"> padding: 0;
</span><span class="lines">@@ -241,6 +243,14 @@
</span><span class="cx"> background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 44"><g stroke="rgba(0, 0, 0, 0.4)" fill="none"><path d="M 10.5,20.5 v -5 h 5 M 10.5,15.5 l 5,5"/><path d="M 24.5,24.5 v 5 h -5 M 24.5,29.5 l -5,-5"/></g></svg>');
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-optimized-fullscreen-button {
+ width: 35px;
+ height: 44px;
+ background-size: 35px 44px;
+ opacity: 0.9;
+ background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 44"><g stroke="rgba(0, 0, 0, 0.4)" fill="none"><path d="M 10,15 h 14 v 14 h -14 v -14"/></g></svg>');
+}
+
</ins><span class="cx"> video::-webkit-media-controls-play-button {
</span><span class="cx"> width: 41px;
</span><span class="cx"> height: 44px;
</span><span class="lines">@@ -261,6 +271,10 @@
</span><span class="cx"> background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 44"><g stroke="white" fill="none"><path d="M 10,20 v -5 h 5 M 10,15 l 5,5"/><path d="M 24,24 v 5 h -5 M 24,29 l -5,-5"/></g></svg>');
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-optimized-fullscreen-button:active {
+ background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 44"><g stroke="white" fill="none"><path d="M 10,15 h 14 v 14 h -14 v -14"/></g></svg>');
+}
+
</ins><span class="cx"> video::-webkit-media-controls-timeline,
</span><span class="cx"> audio::-webkit-media-controls-timeline {
</span><span class="cx"> -webkit-appearance: none;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -167,6 +167,9 @@
</span><span class="cx"> this.listenFor(this.controls.fullscreenButton, 'touchstart', this.handleFullscreenTouchStart);
</span><span class="cx"> this.listenFor(this.controls.fullscreenButton, 'touchend', this.handleFullscreenTouchEnd);
</span><span class="cx"> this.listenFor(this.controls.fullscreenButton, 'touchcancel', this.handleFullscreenTouchCancel);
</span><ins>+ this.listenFor(this.controls.optimizedFullscreenButton, 'touchstart', this.handleOptimizedFullscreenTouchStart);
+ this.listenFor(this.controls.optimizedFullscreenButton, 'touchend', this.handleOptimizedFullscreenTouchEnd);
+ this.listenFor(this.controls.optimizedFullscreenButton, 'touchcancel', this.handleOptimizedFullscreenTouchCancel);
</ins><span class="cx"> this.stopListeningFor(this.controls.playButton, 'click', this.handlePlayButtonClicked);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -204,8 +207,11 @@
</span><span class="cx"> this.controls.timelineBox.appendChild(this.controls.timeline);
</span><span class="cx"> this.controls.timelineBox.appendChild(this.controls.remainingTime);
</span><span class="cx"> }
</span><del>- if (!this.isAudio())
</del><ins>+ if (!this.isAudio()) {
</ins><span class="cx"> this.controls.panel.appendChild(this.controls.fullscreenButton);
</span><ins>+ if (this.host.optimizedFullscreenSupported)
+ this.controls.panel.appendChild(this.controls.optimizedFullscreenButton);
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> configureFullScreenControls: function() {
</span><span class="lines">@@ -320,6 +326,10 @@
</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><ins>+
+ var scaleDetectionThreshold = 0.2;
+ if (event.scale > 1 + scaleDetectionThreshold || event.scale < 1 - scaleDetectionThreshold)
+ delete this.lastDoubleTouchTime;
</ins><span class="cx">
</span><span class="cx"> if (this.mostRecentNumberOfTargettedTouches == 2 && event.scale >= 1.0)
</span><span class="cx"> event.preventDefault();
</span><span class="lines">@@ -331,16 +341,13 @@
</span><span class="cx">
</span><span class="cx"> var velocity = Math.abs(event.scale - 1) / duration;
</span><span class="cx">
</span><del>- if (velocity < 2)
</del><ins>+ var pinchOutVelocityThreshold = 2;
+ var pinchOutGestureScaleThreshold = 1.25;
+ if (velocity < pinchOutVelocityThreshold || event.scale < pinchOutGestureScaleThreshold)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (event.scale >= 1.25) {
- delete this.gestureStartTime;
- this.video.webkitEnterFullscreen();
- } else if (event.scale <= 0.75) {
- delete this.gestureStartTime;
- this.host.enterFullscreenOptimized();
- }
</del><ins>+ delete this.gestureStartTime;
+ this.video.webkitEnterFullscreen();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleBaseGestureEnd: function(event) {
</span><span class="lines">@@ -352,7 +359,24 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.mostRecentNumberOfTargettedTouches = event.targetTouches.length;
</span><del>-
</del><ins>+
+ if (this.host.optimizedFullscreenSupported) {
+ if (this.mostRecentNumberOfTargettedTouches == 2) {
+ var now = new Date();
+ if (this.lastDoubleTouchTime === undefined) {
+ this.lastDoubleTouchTime = now;
+ } else {
+ var doubleTouchIntervalThresholdms = 300
+ if (now - this.lastDoubleTouchTime < doubleTouchSpeedThreshold) {
+ delete this.lastDoubleTouchTime;
+ event.preventDefault();
+ this.host.enterFullscreenOptimized();
+ } else
+ this.lastDoubleTouchTime = now;
+ }
+ }
+ }
+
</ins><span class="cx"> if (this.controlsAreHidden()) {
</span><span class="cx"> this.showControls();
</span><span class="cx"> if (this.hideTimer)
</span><span class="lines">@@ -407,12 +431,36 @@
</span><span class="cx"> return true;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ handleOptimizedFullscreenButtonClicked: function(event) {
+ if (this.isFullenterFullscreenOptimizedScreen())
+ this.video.webkitExitFullscreen();
+ else
+ this.host.enterFullscreenOptimized();
+ },
+
+ handleOptimizedFullscreenTouchStart: function() {
+ this.controls.optimizedFullscreenButton.classList.add('active');
+ },
+
+ handleOptimizedFullscreenTouchEnd: function(event) {
+ this.controls.optimizedFullscreenButton.classList.remove('active');
+
+ this.handleOptimizedFullscreenButtonClicked();
+
+ return true;
+ },
+
+ handleOptimizedFullscreenTouchCancel: function(event) {
+ this.controls.optimizedFullscreenButton.classList.remove('active');
+ return true;
+ },
+
</ins><span class="cx"> handleStartPlaybackButtonTouchStart: function(event) {
</span><del>- this.controls.fullscreenButton.classList.add('active');
</del><ins>+ this.controls.startPlaybackButton.classList.add('active');
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleStartPlaybackButtonTouchEnd: function(event) {
</span><del>- this.controls.fullscreenButton.classList.remove('active');
</del><ins>+ this.controls.startPlaybackButton.classList.remove('active');
</ins><span class="cx"> if (this.video.error)
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -422,7 +470,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleStartPlaybackButtonTouchCancel: function(event) {
</span><del>- this.controls.fullscreenButton.classList.remove('active');
</del><ins>+ this.controls.startPlaybackButton.classList.remove('active');
</ins><span class="cx"> return true;
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -2848,6 +2848,7 @@
</span><span class="cx"> _wkGetVendorNameForNavigator
</span><span class="cx"> _wkGetVerticalGlyphsForCharacters
</span><span class="cx"> _wkIsGB18030ComplianceRequired
</span><ins>+_wkIsOptimizedFullscreenSupported
</ins><span class="cx"> _wkSetLayerContentsScale
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -73,4 +73,6 @@
</span><span class="cx"> extern CFStringRef (*wkGetPlatformNameForNavigator)(void);
</span><span class="cx"> extern CFStringRef (*wkGetVendorNameForNavigator)(void);
</span><span class="cx">
</span><ins>+extern bool (*wkIsOptimizedFullscreenSupported)(void);
+
</ins><span class="cx"> #endif // WebCoreSystemInterfaceIOS_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -130,6 +130,8 @@
</span><span class="cx"> WEBCORE_EXPORT CFStringRef (*wkGetPlatformNameForNavigator)(void);
</span><span class="cx"> WEBCORE_EXPORT CFStringRef (*wkGetVendorNameForNavigator)(void);
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT BOOL (*wkIsOptimizedFullscreenSupported)(void);
+
</ins><span class="cx"> WEBCORE_EXPORT int (*wkExernalDeviceTypeForPlayer)(AVPlayer *);
</span><span class="cx"> WEBCORE_EXPORT NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> HTMLMediaElement::VideoFullscreenMode m_mode;
</span><span class="cx"> bool m_exitRequested;
</span><span class="cx"> bool m_exitCompleted;
</span><ins>+ bool m_enterRequested;
</ins><span class="cx">
</span><span class="cx"> WebAVPlayerController *playerController();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -861,10 +861,10 @@
</span><span class="cx">
</span><span class="cx"> m_exitCompleted = false;
</span><span class="cx"> m_exitRequested = false;
</span><ins>+ m_enterRequested = true;
</ins><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> [m_videoLayerContainer setBackgroundColor:[[getUIColorClass() blackColor] CGColor]];
</span><del>-#if ENABLE(OPTIMIZED_FULLSCREEN)
</del><span class="cx"> if (m_mode == HTMLMediaElement::VideoFullscreenModeOptimized) {
</span><span class="cx"> [m_playerViewController startOptimizedFullscreenWithStartCompletionHandler:^(BOOL success, NSError *) {
</span><span class="cx">
</span><span class="lines">@@ -897,7 +897,6 @@
</span><span class="cx"> }
</span><span class="cx"> }];
</span><span class="cx"> } else
</span><del>-#endif
</del><span class="cx"> if (m_mode == HTMLMediaElement::VideoFullscreenModeStandard) {
</span><span class="cx"> [m_playerViewController enterFullScreenWithCompletionHandler:^(BOOL, NSError*)
</span><span class="cx"> {
</span><span class="lines">@@ -941,12 +940,10 @@
</span><span class="cx"> [m_videoLayerContainer setVideoLayerGravity:AVVideoLayerGravityResizeAspect];
</span><span class="cx"> [[m_playerViewController view] layoutIfNeeded];
</span><span class="cx">
</span><del>-#if ENABLE(OPTIMIZED_FULLSCREEN)
</del><span class="cx"> if (m_mode == HTMLMediaElement::VideoFullscreenModeOptimized) {
</span><span class="cx"> [m_window setHidden:NO];
</span><span class="cx"> [m_playerViewController stopOptimizedFullscreen];
</span><span class="cx"> } else
</span><del>-#endif
</del><span class="cx"> if (m_mode == HTMLMediaElement::VideoFullscreenModeStandard) {
</span><span class="cx"> [m_playerViewController exitFullScreenWithCompletionHandler:^(BOOL, NSError*) {
</span><span class="cx"> m_exitCompleted = true;
</span><span class="lines">@@ -1003,6 +1000,7 @@
</span><span class="cx"> WebThreadRun(^{
</span><span class="cx"> if (m_fullscreenChangeObserver)
</span><span class="cx"> m_fullscreenChangeObserver->didCleanupFullscreen();
</span><ins>+ m_enterRequested = false;
</ins><span class="cx"> protect = nullptr;
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -1034,6 +1032,9 @@
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen()
</span><span class="cx"> {
</span><ins>+ if (!m_enterRequested)
+ return;
+
</ins><span class="cx"> if (m_mode == HTMLMediaElement::VideoFullscreenModeOptimized)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1047,7 +1048,7 @@
</span><span class="cx"> }];
</span><span class="cx"> });
</span><span class="cx">
</span><del>- if (m_videoFullscreenModel)
</del><ins>+ if (m_videoFullscreenModel && !m_exitRequested)
</ins><span class="cx"> m_videoFullscreenModel->requestExitFullscreen();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-11-03 Jeremy Jones <jeremyj@apple.com>
+
+ Add button and enable optimized fullscreen.
+ https://bugs.webkit.org/show_bug.cgi?id=138351
+
+ Reviewed by Eric Carlson.
+
+ Add IsOptimizedFullscreenSupported to enable the feature only where appropriate.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): added
+
</ins><span class="cx"> 2014-11-04 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add ptr() method to Ref class
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx"> INIT(GetAvailableScreenSize);
</span><span class="cx"> INIT(GetScreenScaleFactor);
</span><span class="cx"> INIT(IsGB18030ComplianceRequired);
</span><ins>+ INIT(IsOptimizedFullscreenSupported);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> INIT(CreateCTLineWithUniCharProvider);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-11-03 Jeremy Jones <jeremyj@apple.com>
+
+ Add button and enable optimized fullscreen.
+ https://bugs.webkit.org/show_bug.cgi?id=138351
+
+ Reviewed by Eric Carlson.
+
+ Add IsOptimizedFullscreenSupported to enable the feature only where appropriate.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): add IsOptimizedFullscreenSupported
+
</ins><span class="cx"> 2014-11-04 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Add long press support for links in WKPDFView
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (175595 => 175596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-11-05 01:24:20 UTC (rev 175595)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-11-05 01:36:42 UTC (rev 175596)
</span><span class="lines">@@ -207,6 +207,7 @@
</span><span class="cx"> INIT(GetAvailableScreenSize);
</span><span class="cx"> INIT(GetScreenScaleFactor);
</span><span class="cx"> INIT(IsGB18030ComplianceRequired);
</span><ins>+ INIT(IsOptimizedFullscreenSupported);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PUBLIC_SUFFIX_LIST)
</span></span></pre>
</div>
</div>
</body>
</html>