Changeset 209017 in webkit

Timestamp:

Nov 28, 2016 2:19:08 PM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r209013. rdar://problem/29404778

Location:

branches/safari-602-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (2 diffs)

branches/safari-602-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-28  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r209013. 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 Darin Adler.
+
+            * html/HTMLMediaElement.cpp:
+            (WebCore::needsPlaybackControlsManagerQuirk):
+            (WebCore::HTMLMediaElement::updatePlaybackControlsManager):
+
 2016-11-14  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp

@@ -7348 +7348 @@
 }
 
+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()
 {
@@ -7354 +7363 @@
         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 (auto bestMediaElement = bestMediaElementForShowingPlaybackControlsManager(MediaElementSession::PlaybackControlsPurpose::ControlsManager))
+    if (bestMediaElement && !quirkDisablesPlaybackControlsManager)
         page->chrome().client().setUpPlaybackControlsManager(*bestMediaElement);
     else