Changeset 245944 in webkit

Timestamp:

May 30, 2019, 8:14:35 PM (6 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r245890, 245887.

Breaks internal builds.

Reverted changeset:
"Video playback in Safari should continue when CarPlay is plugged in"
​https://bugs.webkit.org/show_bug.cgi?id=198345
​https://trac.webkit.org/changeset/245887/webkit# Please enter the commit message for your changes. Lines starting

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-isplayingtoautomotiveheadunit-expected.txt (deleted)
• LayoutTests/media/video-isplayingtoautomotiveheadunit.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)
• Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (modified) (1 diff)
• Source/WebCore/platform/audio/PlatformMediaSessionManager.h (modified) (2 diffs)
• Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h (modified) (1 diff)
• Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (modified) (12 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-30  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r245890, 245887.
+
+        Breaks internal builds.
+
+        Reverted changeset:
+        "Video playback in Safari should continue when CarPlay is plugged in"
+        https://bugs.webkit.org/show_bug.cgi?id=198345
+        https://trac.webkit.org/changeset/245887/webkit
+
+
 2019-05-30  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-30  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r245890, 245887.
+
+        Breaks internal builds.
+
+        Reverted changeset:
+        "Video playback in Safari should continue when CarPlay is plugged in"
+        https://bugs.webkit.org/show_bug.cgi?id=198345
+        https://trac.webkit.org/changeset/245887/webkit
+
 2019-05-30  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -7716 +7716 @@
             return true;
         }
-        if (PlatformMediaSessionManager::sharedManager().isPlayingToAutomotiveHeadUnit()) {
-            INFO_LOG(LOGIDENTIFIER, "returning true because isPlayingToAutomotiveHeadUnit() is true");
-            return true;
-        }
         if (m_videoFullscreenMode & VideoFullscreenModePictureInPicture)
             return true;
@@ -7729 +7725 @@
         if (isPlayingToExternalTarget()) {
             INFO_LOG(LOGIDENTIFIER, "returning true because isPlayingToExternalTarget() is true");
-            return true;
-        }
-        if (PlatformMediaSessionManager::sharedManager().isPlayingToAutomotiveHeadUnit()) {
-            INFO_LOG(LOGIDENTIFIER, "returning true because isPlayingToAutomotiveHeadUnit() is true");
             return true;
         }

trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp

@@ -392 +392 @@
 }
 
-void PlatformMediaSessionManager::setIsPlayingToAutomotiveHeadUnit(bool isPlayingToAutomotiveHeadUnit)
-{
-    if (isPlayingToAutomotiveHeadUnit == m_isPlayingToAutomotiveHeadUnit)
-        return;
-
-    ALWAYS_LOG(LOGIDENTIFIER, isPlayingToAutomotiveHeadUnit);
-    m_isPlayingToAutomotiveHeadUnit = isPlayingToAutomotiveHeadUnit;
-}
 
 void PlatformMediaSessionManager::sessionIsPlayingToWirelessPlaybackTargetChanged(PlatformMediaSession& session)

trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h

@@ -130 +130 @@
     void sessionIsPlayingToWirelessPlaybackTargetChanged(PlatformMediaSession&);
 
-    WEBCORE_EXPORT void setIsPlayingToAutomotiveHeadUnit(bool);
-    bool isPlayingToAutomotiveHeadUnit() const { return m_isPlayingToAutomotiveHeadUnit; }
-
     void forEachMatchingSession(const Function<bool(const PlatformMediaSession&)>& predicate, const Function<void(PlatformMediaSession&)>& matchingCallback);
 
@@ -192 +189 @@
     bool m_willIgnoreSystemInterruptions { false };
     bool m_processIsSuspended { false };
-    bool m_isPlayingToAutomotiveHeadUnit { false };
 
 #if USE(AUDIO_SESSION)

trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h

@@ -48 +48 @@
     void externalOutputDeviceAvailableDidChange();
     bool hasWirelessTargetsAvailable() override;
-    void carPlayServerDied();
-    void updateCarPlayIsConnected(Optional<bool>&&);
 
 private:

trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm

@@ -57 +57 @@
 SOFT_LINK_CLASS_OPTIONAL(Celestial, AVSystemController)
 SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_PIDToInheritApplicationStateFrom, NSString *)
-SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_CarPlayIsConnectedAttribute, NSString *)
-SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_CarPlayIsConnectedDidChangeNotification, NSString *)
-SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_CarPlayIsConnectedNotificationParameter, NSString *)
-SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_ServerConnectionDiedNotification, NSString *)
 #endif
 
@@ -114 +110 @@
     END_BLOCK_OBJC_EXCEPTIONS
     resetRestrictions();
-
-    updateCarPlayIsConnected(WTF::nullopt);
 }
 
@@ -199 +193 @@
 
     END_BLOCK_OBJC_EXCEPTIONS
-}
-
-void MediaSessionManageriOS::carPlayServerDied()
-{
-    ALWAYS_LOG(LOGIDENTIFIER);
-    updateCarPlayIsConnected(WTF::nullopt);
-}
-
-void MediaSessionManageriOS::updateCarPlayIsConnected(Optional<bool>&& carPlayIsConnected)
-{
-    if (carPlayIsConnected) {
-        setIsPlayingToAutomotiveHeadUnit(carPlayIsConnected.value());
-        return;
-    }
-
-    if (!canLoadAVSystemController_CarPlayIsConnectedAttribute()) {
-        setIsPlayingToAutomotiveHeadUnit(false);
-        return;
-    }
-
-    setIsPlayingToAutomotiveHeadUnit([[[getAVSystemControllerClass() sharedAVSystemController] attributeForKey:getAVSystemController_CarPlayIsConnectedAttribute()] boolValue]);
 }
 
@@ -246 +219 @@
     [center addObserver:self selector:@selector(applicationDidEnterBackground:) name:PAL::get_UIKit_UIApplicationDidEnterBackgroundNotification() object:nil];
     [center addObserver:self selector:@selector(applicationDidEnterBackground:) name:WebUIApplicationDidEnterBackgroundNotification object:nil];
-    if (canLoadAVSystemController_ServerConnectionDiedNotification())
-        [center addObserver:self selector:@selector(carPlayServerDied:) name:getAVSystemController_ServerConnectionDiedNotification() object:nil];
-    if (canLoadAVSystemController_CarPlayIsConnectedDidChangeNotification())
-        [center addObserver:self selector:@selector(carPlayIsConnectedDidChange:) name:getAVSystemController_CarPlayIsConnectedDidChangeNotification() object:nil];
 
     // Now playing won't work unless we turn on the delivery of remote control events.
@@ -318 +287 @@
     LOG(Media, "-[WebMediaSessionHelper startMonitoringAirPlayRoutes]");
 
-    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self)]() mutable {
+    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = WTFMove(self)]() mutable {
         ASSERT(!protectedSelf->_routeDetector);
 
@@ -325 +294 @@
             protectedSelf->_routeDetector = adoptNS([PAL::allocAVRouteDetectorInstance() init]);
             protectedSelf->_routeDetector.get().routeDetectionEnabled = protectedSelf->_monitoringAirPlayRoutes;
-            [[NSNotificationCenter defaultCenter] addObserver:protectedSelf.get() selector:@selector(wirelessRoutesAvailableDidChange:) name:AVRouteDetectorMultipleRoutesDetectedDidChangeNotification object:protectedSelf->_routeDetector.get()];
+            [[NSNotificationCenter defaultCenter] addObserver:protectedSelf selector:@selector(wirelessRoutesAvailableDidChange:) name:AVRouteDetectorMultipleRoutesDetectedDidChangeNotification object:protectedSelf->_routeDetector.get()];
 
             protectedSelf->_callback->externalOutputDeviceAvailableDidChange();
@@ -360 +329 @@
         flags = PlatformMediaSession::MayResumePlaying;
 
-    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self), type, flags]() mutable {
+    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = WTFMove(self), type, flags]() mutable {
         auto* callback = protectedSelf->_callback;
         if (!callback)
@@ -383 +352 @@
 
     BOOL isSuspendedUnderLock = [[[notification userInfo] objectForKey:@"isSuspendedUnderLock"] boolValue];
-    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self), isSuspendedUnderLock]() mutable {
+    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = WTFMove(self), isSuspendedUnderLock]() mutable {
         if (auto* callback = protectedSelf->_callback)
             callback->applicationWillEnterForeground(isSuspendedUnderLock);
@@ -398 +367 @@
     LOG(Media, "-[WebMediaSessionHelper applicationDidBecomeActive]");
 
-    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self)]() mutable {
+    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = WTFMove(self)]() mutable {
         if (auto* callback = protectedSelf->_callback)
             callback->applicationDidBecomeActive();
@@ -413 +382 @@
     LOG(Media, "-[WebMediaSessionHelper applicationWillResignActive]");
 
-    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self)]() mutable {
+    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = WTFMove(self)]() mutable {
         if (auto* callback = protectedSelf->_callback)
             callback->applicationWillBecomeInactive();
@@ -428 +397 @@
     LOG(Media, "-[WebMediaSessionHelper wirelessRoutesAvailableDidChange]");
 
-    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self)]() mutable {
+    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = WTFMove(self)]() mutable {
         if (auto* callback = protectedSelf->_callback)
             callback->externalOutputDeviceAvailableDidChange();
@@ -442 +411 @@
 
     BOOL isSuspendedUnderLock = [[[notification userInfo] objectForKey:@"isSuspendedUnderLock"] boolValue];
-    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self), isSuspendedUnderLock]() mutable {
+    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = WTFMove(self), isSuspendedUnderLock]() mutable {
         if (auto* callback = protectedSelf->_callback)
             callback->applicationDidEnterBackground(isSuspendedUnderLock);
     });
 }
-
-- (void)carPlayServerDied:(NSNotification *)notification
-{
-    if (!_callback)
-        return;
-
-    LOG(Media, "-[WebMediaSessionHelper carPlayServerDied:]");
-    UNUSED_PARAM(notification);
-    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self)]() mutable {
-        if (auto* callback = protectedSelf->_callback)
-            callback->carPlayServerDied();
-    });
-}
-
-- (void)carPlayIsConnectedDidChange:(NSNotification *)notification
-{
-    if (!_callback)
-        return;
-
-    Optional<bool> carPlayIsConnected;
-    if (notification && canLoadAVSystemController_CarPlayIsConnectedNotificationParameter()) {
-        NSNumber *nsCarPlayIsConnected = [[notification userInfo] valueForKey:getAVSystemController_CarPlayIsConnectedNotificationParameter()];
-        if (nsCarPlayIsConnected)
-            carPlayIsConnected = [nsCarPlayIsConnected boolValue];
-    }
-
-    callOnWebThreadOrDispatchAsyncOnMainThread([protectedSelf = retainPtr(self), carPlayIsConnected = WTFMove(carPlayIsConnected)]() mutable {
-        if (auto* callback = protectedSelf->_callback)
-            callback->updateCarPlayIsConnected(WTFMove(carPlayIsConnected));
-    });
-}
 @end
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -493 +493 @@
     PlatformMediaSessionManager::sharedManager().setWillIgnoreSystemInterruptions(true);
 #endif
-    PlatformMediaSessionManager::sharedManager().setIsPlayingToAutomotiveHeadUnit(false);
 #if HAVE(ACCESSIBILITY)
     AXObjectCache::setEnhancedUserInterfaceAccessibility(false);
@@ -5069 +5068 @@
 }
 
-void Internals::setIsPlayingToAutomotiveHeadUnit(bool isPlaying)
-{
-    PlatformMediaSessionManager::sharedManager().setIsPlayingToAutomotiveHeadUnit(isPlaying);
-}
-
 } // namespace WebCore

trunk/Source/WebCore/testing/Internals.h

@@ -824 +824 @@
     void setXHRMaximumIntervalForUserGestureForwarding(XMLHttpRequest&, double);
 
-    void setIsPlayingToAutomotiveHeadUnit(bool);
-
 private:
     explicit Internals(Document&);

trunk/Source/WebCore/testing/Internals.idl

@@ -754 +754 @@
 
     void setXHRMaximumIntervalForUserGestureForwarding(XMLHttpRequest xhr, double interval);
-
-    void setIsPlayingToAutomotiveHeadUnit(boolean value);
-};
+};