<!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>[173562] branches/safari-600.1-branch/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/173562">173562</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-09-12 10:11:23 -0700 (Fri, 12 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173533">r173533</a>. rdar://problem/18187939</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoredomDocumentcpp">branches/safari-600.1-branch/Source/WebCore/dom/Document.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (173561 => 173562)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-12 16:27:47 UTC (rev 173561)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-12 17:11:23 UTC (rev 173562)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-09-12 Lucas Forschler <lforschler@apple.com>
+
+ Merge r173533
+
+ 2014-09-11 Jer Noble <jer.noble@apple.com>
+
+ Add site-specific quirk for entering fullscreen on YouTube.com.
+ https://bugs.webkit.org/show_bug.cgi?id=136742
+
+ Reviewed by Eric Carlson.
+
+ YouTube only resizes its <video> content when entering fullscreen after receiving the "webkitfullscreenchange"
+ event, which is fired once the animation to enter fullscreen completes. This leaves the apparent <video> content
+ too small during the animation, especially at the beginning of the animation. Add a site-specific hack for
+ YouTube sites which fires the "webkitfullscreenchange" event synchronously with the beginning of the enter
+ fullscreen animation. This will cause YouTube to resize their <video> content during the period of time where we
+ disable screen updates, and makes the enter fullscreen animation seamless.
+
+ Add a static utility method, hostIsYouTube(), for the various pieces of this site-specific hack, and expand it
+ to match youtube.co.uk, youtube.fr, etc.
+
+ * dom/Document.cpp:
+ (WebCore::hostIsYouTube): Added.
+ (WebCore::Document::webkitWillEnterFullScreenForElement): Fire fullscreenchange event if hacks are enabled.
+ (WebCore::Document::webkitDidEnterFullScreenForElement): Don't fire the event if same.
+ (WebCore::Document::webkitDidExitFullScreenForElement): Use hostIsYouTube().
+
</ins><span class="cx"> 2014-09-08 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r173365
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/dom/Document.cpp (173561 => 173562)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/dom/Document.cpp 2014-09-12 16:27:47 UTC (rev 173561)
+++ branches/safari-600.1-branch/Source/WebCore/dom/Document.cpp 2014-09-12 17:11:23 UTC (rev 173562)
</span><span class="lines">@@ -158,6 +158,7 @@
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx"> #include <wtf/text/StringBuffer.h>
</span><ins>+#include <yarr/RegularExpression.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SHARED_WORKERS)
</span><span class="cx"> #include "SharedWorkerRepository.h"
</span><span class="lines">@@ -5331,6 +5332,15 @@
</span><span class="cx"> fullScreenElement->parentNode()->setNeedsStyleRecalc(ReconstructRenderTree);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool hostIsYouTube(const String& host)
+{
+ // Match .youtube.com, youtube.com, youtube.co.uk, and all two-letter country codes.
+ static NeverDestroyed<JSC::Yarr::RegularExpression> youtubePattern("(^|\\.)youtube.(com|co.uk|[a-z]{2})$", TextCaseInsensitive);
+ ASSERT(youtubePattern.get().isValid());
+
+ return youtubePattern.get().match(host);
+}
+
</ins><span class="cx"> void Document::webkitWillEnterFullScreenForElement(Element* element)
</span><span class="cx"> {
</span><span class="cx"> if (!hasLivingRenderTree() || inPageCache())
</span><span class="lines">@@ -5368,7 +5378,10 @@
</span><span class="cx"> RenderFullScreen::wrapRenderer(renderer, renderer ? renderer->parent() : nullptr, *this);
</span><span class="cx">
</span><span class="cx"> m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(true);
</span><del>-
</del><ins>+
+ if (settings() && settings()->needsSiteSpecificQuirks() && hostIsYouTube(url().host()))
+ fullScreenChangeDelayTimerFired(m_fullScreenChangeDelayTimer);
+
</ins><span class="cx"> recalcStyle(Style::Force);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5382,7 +5395,8 @@
</span><span class="cx">
</span><span class="cx"> m_fullScreenElement->didBecomeFullscreenElement();
</span><span class="cx">
</span><del>- m_fullScreenChangeDelayTimer.startOneShot(0);
</del><ins>+ if (!settings() || !settings()->needsSiteSpecificQuirks() || !hostIsYouTube(url().host()))
+ m_fullScreenChangeDelayTimer.startOneShot(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::webkitWillExitFullScreenForElement(Element*)
</span><span class="lines">@@ -5421,8 +5435,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME(136605): Remove this quirk once YouTube moves to relative widths and heights for
</span><span class="cx"> // fullscreen mode.
</span><del>- String host = url().host();
- if (settings() && settings()->needsSiteSpecificQuirks() && (host.endsWith(".youtube.com", false) || equalIgnoringCase("youtube.com", host)))
</del><ins>+ if (settings() && settings()->needsSiteSpecificQuirks() && hostIsYouTube(url().host()))
</ins><span class="cx"> exitingDocument.fullScreenChangeDelayTimerFired(exitingDocument.m_fullScreenChangeDelayTimer);
</span><span class="cx"> else
</span><span class="cx"> exitingDocument.m_fullScreenChangeDelayTimer.startOneShot(0);
</span></span></pre>
</div>
</div>
</body>
</html>