Changeset 182274 in webkit

Timestamp:

Apr 2, 2015, 10:15:48 AM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[iOS] Fix AirPlay problem caused by r182240
​https://bugs.webkit.org/show_bug.cgi?id=143337

Reviewed by Jer Noble.

• html/HTMLMediaSession.cpp:

(WebCore::HTMLMediaSession::wirelessVideoPlaybackDisabled): Return false if the legacy attribute

"x-webkit-airplay" has the value "allow".

• html/HTMLVideoElement.cpp:

(WebCore::HTMLVideoElement::parseAttribute): Don't call webkitWirelessVideoPlaybackDisabled when

processing "x-webkit-airplay" and "x-webkit-wirelessvideoplaybackdisabled", just consider
the attribute/value.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-02  Eric Carlson  <eric.carlson@apple.com>
+
+        [iOS] Fix AirPlay problem caused by r182240
+        https://bugs.webkit.org/show_bug.cgi?id=143337
+
+        Reviewed by Jer Noble.
+
+        * html/HTMLMediaSession.cpp:
+        (WebCore::HTMLMediaSession::wirelessVideoPlaybackDisabled): Return false if the legacy attribute
+            "x-webkit-airplay" has the value "allow".
+        * html/HTMLVideoElement.cpp:
+        (WebCore::HTMLVideoElement::parseAttribute): Don't call webkitWirelessVideoPlaybackDisabled when
+            processing "x-webkit-airplay" and "x-webkit-wirelessvideoplaybackdisabled", just consider
+            the attribute/value.
+
 2015-04-02  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaSession.cpp

@@ -242 +242 @@
         return true;
     }
+    if (equalIgnoringCase(legacyAirplayAttributeValue, "allow")) {
+        LOG(Media, "HTMLMediaSession::wirelessVideoPlaybackDisabled - returning FALSE because of legacy attribute");
+        return false;
+    }
 #endif
 

trunk/Source/WebCore/html/HTMLVideoElement.cpp

@@ -123 +123 @@
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     else if (name == webkitwirelessvideoplaybackdisabledAttr)
-        mediaSession().setWirelessVideoPlaybackDisabled(*this, webkitWirelessVideoPlaybackDisabled());
+        mediaSession().setWirelessVideoPlaybackDisabled(*this, true);
 #endif
     else {
@@ -129 +129 @@
 
 #if PLATFORM(IOS) && ENABLE(WIRELESS_PLAYBACK_TARGET)
-        if (name == webkitairplayAttr)
-            mediaSession().setWirelessVideoPlaybackDisabled(*this, webkitWirelessVideoPlaybackDisabled());
+        if (name == webkitairplayAttr) {
+            bool disabled = false;
+            if (equalIgnoringCase(fastGetAttribute(HTMLNames::webkitairplayAttr), "deny"))
+                disabled = true;
+            mediaSession().setWirelessVideoPlaybackDisabled(*this, disabled);
+        }
 #endif
     }