Changeset 201522 in webkit

Timestamp:

May 31, 2016, 1:47:53 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] AirPlay route is sometimes reset when changing video.src
​https://bugs.webkit.org/show_bug.cgi?id=158226
<rdar://problem/24197592>

Reviewed by Jer Noble.

Source/WebCore:

Test: media/airplay-autoplay.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::webkitShowPlaybackTargetPicker): Remove the gesture requirement

if currently processing a user gesture.

(WebCore::HTMLMediaElement::dispatchEvent): Set m_failedToPlayToWirelessTarget to false when

dispatching webkitcurrentplaybacktargetiswirelesschanged so an element can succeed after failing.

LayoutTests:

• media/airplay-autoplay-expected.txt: Added.
• media/airplay-autoplay.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/airplay-autoplay-expected.txt (added)
• LayoutTests/media/airplay-autoplay.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-05-31  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] AirPlay route is sometimes reset when changing video.src
+        https://bugs.webkit.org/show_bug.cgi?id=158226
+        <rdar://problem/24197592>
+
+        Reviewed by Jer Noble.
+
+        * media/airplay-autoplay-expected.txt: Added.
+        * media/airplay-autoplay.html: Added.
+
 2016-05-31  Dave Hyatt  <hyatt@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1294 +1294 @@
 [ Yosemite ] media/airplay-target-availability.html
 [ Yosemite ] media/controls/airplay-picker.html
+[ Yosemite ] media/airplay-autoplay.html
 
 webkit.org/b/153086 sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/15.1.3/15.1.3.3_encodeURI/S15.1.3.3_A2.4_T2.html [ Pass Crash ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-31  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] AirPlay route is sometimes reset when changing video.src
+        https://bugs.webkit.org/show_bug.cgi?id=158226
+        <rdar://problem/24197592>
+
+        Reviewed by Jer Noble.
+
+        Test: media/airplay-autoplay.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::webkitShowPlaybackTargetPicker): Remove the gesture requirement
+          if currently processing a user gesture.
+        (WebCore::HTMLMediaElement::dispatchEvent): Set m_failedToPlayToWirelessTarget to false when
+          dispatching webkitcurrentplaybacktargetiswirelesschanged so an element can succeed after failing.
+
 2016-05-31  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -5187 +5187 @@
 {
     LOG(Media, "HTMLMediaElement::webkitShowPlaybackTargetPicker(%p)", this);
+    if (ScriptController::processingUserGestureForMedia())
+        removeBehaviorsRestrictionsAfterFirstUserGesture();
     m_mediaSession->showPlaybackTargetPicker(*this);
 }
@@ -5214 +5216 @@
 bool HTMLMediaElement::dispatchEvent(Event& event)
 {
-    if (event.type() == eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent)
+    if (event.type() == eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent) {
+        m_failedToPlayToWirelessTarget = false;
         scheduleDelayedAction(CheckPlaybackTargetCompatablity);
+    }
     return HTMLElement::dispatchEvent(event);
 }