Title: [241297] trunk/Source/WebCore
- Revision
- 241297
- Author
- jer.no...@apple.com
- Date
- 2019-02-12 08:53:12 -0800 (Tue, 12 Feb 2019)
Log Message
Source/WebCore:
Unreviewed build fix; add a HAVE_CELESTIAL guard around Celestial framework usage.
* platform/audio/ios/MediaSessionManagerIOS.h:
* platform/audio/ios/MediaSessionManagerIOS.mm:
(WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary):
Source/WebCore/PAL:
Unreviewed build fix; add a HAVE_CELESTIAL guard around the CelestialSPI.h contents.
* pal/spi/ios/CelestialSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (241296 => 241297)
--- trunk/Source/WebCore/ChangeLog 2019-02-12 16:22:18 UTC (rev 241296)
+++ trunk/Source/WebCore/ChangeLog 2019-02-12 16:53:12 UTC (rev 241297)
@@ -1,3 +1,11 @@
+2019-02-11 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix; add a HAVE_CELESTIAL guard around Celestial framework usage.
+
+ * platform/audio/ios/MediaSessionManagerIOS.h:
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (WebCore::MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary):
+
2019-02-12 Antti Koivisto <an...@apple.com>
Crash in WebCore::ScrollingTree::updateTreeFromStateNode
Modified: trunk/Source/WebCore/PAL/ChangeLog (241296 => 241297)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-02-12 16:22:18 UTC (rev 241296)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-02-12 16:53:12 UTC (rev 241297)
@@ -1,3 +1,9 @@
+2019-02-11 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix; add a HAVE_CELESTIAL guard around the CelestialSPI.h contents.
+
+ * pal/spi/ios/CelestialSPI.h:
+
2019-02-12 Michael Catanzaro <mcatanz...@igalia.com>
[WPE][GTK] Sleep disabler code should inhibit idle when a "System" sleep disabler is requested
Modified: trunk/Source/WebCore/PAL/pal/spi/ios/CelestialSPI.h (241296 => 241297)
--- trunk/Source/WebCore/PAL/pal/spi/ios/CelestialSPI.h 2019-02-12 16:22:18 UTC (rev 241296)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/CelestialSPI.h 2019-02-12 16:53:12 UTC (rev 241297)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PLATFORM(IOS_FAMILY)
+#if HAVE(CELESTIAL)
#pragma once
@@ -46,4 +46,4 @@
#endif
-#endif // PLATFORM(IOS_FAMILY)
+#endif // HAVE(CELESTIAL)
Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h (241296 => 241297)
--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2019-02-12 16:22:18 UTC (rev 241296)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2019-02-12 16:53:12 UTC (rev 241297)
@@ -59,7 +59,9 @@
void providePresentingApplicationPIDIfNecessary() final;
RetainPtr<WebMediaSessionHelper> m_objcObserver;
+#if HAVE(CELESTIAL)
bool m_havePresentedApplicationPID { false };
+#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (241296 => 241297)
--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2019-02-12 16:22:18 UTC (rev 241296)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2019-02-12 16:53:12 UTC (rev 241297)
@@ -52,9 +52,11 @@
SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionInterruptionOptionKey, NSString *)
SOFT_LINK_CONSTANT(AVFoundation, AVRouteDetectorMultipleRoutesDetectedDidChangeNotification, NSString *)
+#if HAVE(CELESTIAL)
SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(Celestial)
SOFT_LINK_CLASS_OPTIONAL(Celestial, AVSystemController)
SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_PIDToInheritApplicationStateFrom, NSString *)
+#endif
#if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
SOFT_LINK_CLASS(AVFoundation, AVRouteDetector)
@@ -177,6 +179,7 @@
void MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary()
{
+#if HAVE(CELESTIAL)
if (m_havePresentedApplicationPID)
return;
m_havePresentedApplicationPID = true;
@@ -188,6 +191,7 @@
[[getAVSystemControllerClass() sharedAVSystemController] setAttribute:@(presentingApplicationPID()) forKey:getAVSystemController_PIDToInheritApplicationStateFrom() error:&error];
if (error)
WTFLogAlways("Failed to set up PID proxying: %s", error.localizedDescription.UTF8String);
+#endif
}
void MediaSessionManageriOS::externalOutputDeviceAvailableDidChange()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
