Title: [209046] branches/safari-602-branch/Source/WebCore
- Revision
- 209046
- Author
- [email protected]
- Date
- 2016-11-28 16:22:43 -0800 (Mon, 28 Nov 2016)
Log Message
Merge r209045. rdar://problem/29404778
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (209045 => 209046)
--- 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)
@@ -1,5 +1,26 @@
2016-11-28 Matthew Hanson <[email protected]>
+ Merge r209045. rdar://problem/29404778
+
+ 2016-11-28 Beth Dakin <[email protected]>
+
+ 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 <[email protected]>
+
Merge r209013. rdar://problem/29404778
2016-11-28 Beth Dakin <[email protected]>
Modified: branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp (209045 => 209046)
--- 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)
@@ -631,6 +631,15 @@
updatePlaybackControlsManager();
}
+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");
+}
+
HTMLMediaElement* HTMLMediaElement::bestMediaElementForShowingPlaybackControlsManager(MediaElementSession::PlaybackControlsPurpose purpose)
{
auto allSessions = PlatformMediaSessionManager::sharedManager().currentSessionsMatching([] (const PlatformMediaSession& session) {
@@ -655,7 +664,15 @@
if (!strongestSessionCandidate.isVisibleInViewportOrFullscreen && !strongestSessionCandidate.isPlayingAudio && atLeastOneNonCandidateMayBeConfusedForMainContent)
return nullptr;
- return &strongestSessionCandidate.session->element();
+ HTMLMediaElement* strongestElementCandidate = &strongestSessionCandidate.session->element();
+ if (strongestElementCandidate) {
+ if (Page* page = strongestElementCandidate->document().page()) {
+ if (needsPlaybackControlsManagerQuirk(*page))
+ return nullptr;
+ }
+ }
+
+ return strongestElementCandidate;
}
void HTMLMediaElement::registerWithDocument(Document& document)
@@ -7347,15 +7364,6 @@
return renderer && renderer->visibleInViewportState() == RenderElement::VisibleInViewport;
}
-static bool needsPlaybackControlsManagerQuirk(bool needsQuirks, const URL& url)
-{
- if (!needsQuirks)
- return false;
-
- String host = url.host();
- return equalLettersIgnoringASCIICase(host, "www.netflix.com");
-}
-
void HTMLMediaElement::updatePlaybackControlsManager()
{
Page* page = document().page();
@@ -7362,11 +7370,8 @@
if (!page)
return;
- auto bestMediaElement = bestMediaElementForShowingPlaybackControlsManager(MediaElementSession::PlaybackControlsPurpose::ControlsManager);
- bool quirkDisablesPlaybackControlsManager = needsPlaybackControlsManagerQuirk(page->settings().needsSiteSpecificQuirks(), page->mainFrame().document()->url());
-
// FIXME: Ensure that the renderer here should be up to date.
- if (bestMediaElement && !quirkDisablesPlaybackControlsManager)
+ if (auto bestMediaElement = bestMediaElementForShowingPlaybackControlsManager(MediaElementSession::PlaybackControlsPurpose::ControlsManager))
page->chrome().client().setUpPlaybackControlsManager(*bestMediaElement);
else
page->chrome().client().clearPlaybackControlsManager();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes