<!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>[209046] branches/safari-602-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/209046">209046</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-28 16:22:43 -0800 (Mon, 28 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/209045">r209045</a>. rdar://problem/29404778</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (209045 => 209046)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-29 00:14:53 UTC (rev 209045)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-29 00:22:43 UTC (rev 209046)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-11-28 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r209045. rdar://problem/29404778
+
+ 2016-11-28 Beth Dakin <bdakin@apple.com>
+
+ Blacklist Netflix for TouchBar support
+ https://bugs.webkit.org/show_bug.cgi?id=165104
+ -and corresponding-
+ rdar://problem/29404778
+
+ Reviewed by Tim Horton.
+
+ This patch moves the algorithm to
+ bestMediaElementForShowingPlaybackControlsManager() so that Now Playing can also
+ use it.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::needsPlaybackControlsManagerQuirk):
+ (WebCore::HTMLMediaElement::bestMediaElementForShowingPlaybackControlsManager):
+ (WebCore::HTMLMediaElement::updatePlaybackControlsManager):
+
+2016-11-28 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r209013. rdar://problem/29404778
</span><span class="cx">
</span><span class="cx"> 2016-11-28 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp (209045 => 209046)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-11-29 00:14:53 UTC (rev 209045)
+++ branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-11-29 00:22:43 UTC (rev 209046)
</span><span class="lines">@@ -631,6 +631,15 @@
</span><span class="cx"> updatePlaybackControlsManager();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool needsPlaybackControlsManagerQuirk(Page& page)
+{
+ if (!page.settings().needsSiteSpecificQuirks())
+ return false;
+
+ String host = page.mainFrame().document()->url().host();
+ return equalLettersIgnoringASCIICase(host, "www.netflix.com") || host.endsWithIgnoringASCIICase(".netflix.com");
+}
+
</ins><span class="cx"> HTMLMediaElement* HTMLMediaElement::bestMediaElementForShowingPlaybackControlsManager(MediaElementSession::PlaybackControlsPurpose purpose)
</span><span class="cx"> {
</span><span class="cx"> auto allSessions = PlatformMediaSessionManager::sharedManager().currentSessionsMatching([] (const PlatformMediaSession& session) {
</span><span class="lines">@@ -655,7 +664,15 @@
</span><span class="cx"> if (!strongestSessionCandidate.isVisibleInViewportOrFullscreen && !strongestSessionCandidate.isPlayingAudio && atLeastOneNonCandidateMayBeConfusedForMainContent)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return &strongestSessionCandidate.session->element();
</del><ins>+ HTMLMediaElement* strongestElementCandidate = &strongestSessionCandidate.session->element();
+ if (strongestElementCandidate) {
+ if (Page* page = strongestElementCandidate->document().page()) {
+ if (needsPlaybackControlsManagerQuirk(*page))
+ return nullptr;
+ }
+ }
+
+ return strongestElementCandidate;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::registerWithDocument(Document& document)
</span><span class="lines">@@ -7347,15 +7364,6 @@
</span><span class="cx"> return renderer && renderer->visibleInViewportState() == RenderElement::VisibleInViewport;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool needsPlaybackControlsManagerQuirk(bool needsQuirks, const URL& url)
-{
- if (!needsQuirks)
- return false;
-
- String host = url.host();
- return equalLettersIgnoringASCIICase(host, "www.netflix.com");
-}
-
</del><span class="cx"> void HTMLMediaElement::updatePlaybackControlsManager()
</span><span class="cx"> {
</span><span class="cx"> Page* page = document().page();
</span><span class="lines">@@ -7362,11 +7370,8 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto bestMediaElement = bestMediaElementForShowingPlaybackControlsManager(MediaElementSession::PlaybackControlsPurpose::ControlsManager);
- bool quirkDisablesPlaybackControlsManager = needsPlaybackControlsManagerQuirk(page->settings().needsSiteSpecificQuirks(), page->mainFrame().document()->url());
-
</del><span class="cx"> // FIXME: Ensure that the renderer here should be up to date.
</span><del>- if (bestMediaElement && !quirkDisablesPlaybackControlsManager)
</del><ins>+ if (auto bestMediaElement = bestMediaElementForShowingPlaybackControlsManager(MediaElementSession::PlaybackControlsPurpose::ControlsManager))
</ins><span class="cx"> page->chrome().client().setUpPlaybackControlsManager(*bestMediaElement);
</span><span class="cx"> else
</span><span class="cx"> page->chrome().client().clearPlaybackControlsManager();
</span></span></pre>
</div>
</div>
</body>
</html>