Attachment 361697 Details for Bug 194504 – Patch for landing

[patch] Patch for landing

bug-194504-20190211111502.patch (text/plain), 22.80 KB, created by Jer Noble on 2019-02-11 11:15:03 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2019-02-11 11:15:03 PST

Size: 22.80 KB

patch

obsolete

>Subversion Revision: 241196
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1b3855bb4de7328e1d8095ed1d5ba5f2ac361eda..aaa772f77eb22044f61db83e0762dcd228fc79d6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-02-11  Jer Noble  <jer.noble@apple.com>
>+
>+        [Cocoa] Notify AVSystemController of our presenting PID before registering as a Now Playing app.
>+        https://bugs.webkit.org/show_bug.cgi?id=194504
>+
>+        Reviewed by Eric Carlson.
>+
>+        This allows the MediaRemote framework to associate the WebContent process with its host application.
>+
>+        * Modules/mediastream/UserMediaRequest.cpp:
>+        (WebCore::UserMediaRequest::start):
>+        * platform/audio/PlatformMediaSessionManager.h:
>+        (WebCore::PlatformMediaSessionManager::prepareToSendUserMediaPermissionRequest):
>+        * platform/audio/cocoa/MediaSessionManagerCocoa.h:
>+        * platform/audio/cocoa/MediaSessionManagerCocoa.mm:
>+        (MediaSessionManagerCocoa::prepareToSendUserMediaPermissionRequest):
>+        (MediaSessionManagerCocoa::providePresentingApplicationPIDIfNecessary):
>+        (MediaSessionManagerCocoa::updateNowPlayingInfo):
>+
> 2019-01-31  Jer Noble  <jer.noble@apple.com>
> 
>         [Cocoa][EME] AirPlaying a FairPlay-protected HLS stream fails to decrypt
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 8d7d1d2138f772effa84bba80ef10592f8bf448f..110ce9b63c06583394c3283c977614ae9bc38252 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-02-11  Jer Noble  <jer.noble@apple.com>
>+
>+        [Cocoa] Notify AVSystemController of our presenting PID before registering as a Now Playing app.
>+        https://bugs.webkit.org/show_bug.cgi?id=194504
>+
>+        Reviewed by Eric Carlson.
>+
>+        * PAL.xcodeproj/project.pbxproj:
>+        * pal/spi/ios/CelestialSPI.h: Renamed from Source/WebKit/Platform/spi/ios/CelestialSPI.h.
>+
> 2019-02-07  Chris Dumez  <cdumez@apple.com>
> 
>         Mark more heap-allocated classes as fast allocated
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ee5f983b7de2577011c3d82307cdfc021cc91e0b..ff50ec021bbf6b00f7f93bf73164a0e2daa66a38 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-02-11  Jer Noble  <jer.noble@apple.com>
>+
>+        [Cocoa] Notify AVSystemController of our presenting PID before registering as a Now Playing app.
>+        https://bugs.webkit.org/show_bug.cgi?id=194504
>+
>+        Reviewed by Eric Carlson.
>+
>+        * WebKit.xcodeproj/project.pbxproj:
>+        * WebProcess/WebCoreSupport/WebUserMediaClient.cpp:
>+        (WebKit::WebUserMediaClient::requestUserMediaAccess):
>+        * WebProcess/WebPage/WebPage.cpp:
>+        (WebKit::WebPage::prepareToSendUserMediaPermissionRequest): Deleted.
>+        * WebProcess/WebPage/WebPage.h:
>+        (WebKit::WebPage::userMediaPermissionRequestManager):
>+        * WebProcess/WebPage/ios/WebPageIOS.mm:
>+        (WebKit::WebPage::prepareToSendUserMediaPermissionRequest): Deleted.
>+
> 2019-02-08  Keith Rollin  <krollin@apple.com>
> 
>         Unreviewed build fix.
>diff --git a/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp b/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
>index ff5db7388f20cea8a66d3c77ca9193f5a5d9d567..da2628f27c5727876d11c95a32b57123a40e7b1c 100644
>--- a/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
>+++ b/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
>@@ -42,6 +42,7 @@
> #include "JSOverconstrainedError.h"
> #include "Logging.h"
> #include "MediaConstraints.h"
>+#include "PlatformMediaSessionManager.h"
> #include "RealtimeMediaSourceCenter.h"
> #include "SchemeRegistry.h"
> #include "Settings.h"
>@@ -209,6 +210,7 @@ void UserMediaRequest::start()
>         return;
>     }
> 
>+    PlatformMediaSessionManager::sharedManager().prepareToSendUserMediaPermissionRequest();
>     controller->requestUserMediaAccess(*this);
> }
> 
>diff --git a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
>index 032d0084c55eb24d54fb79c432f67226cd3730ff..4306d0f2108c3d131b2042f7c43f56c8cefa4acc 100644
>--- a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
>@@ -154,6 +154,7 @@
> 		A3AB6E651F3D217F009C14B1 /* SystemSleepListenerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3AB6E631F3D217F009C14B1 /* SystemSleepListenerMac.mm */; };
> 		A3C66CDC1F462D6A009E6EE9 /* SessionID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3C66CDA1F462D6A009E6EE9 /* SessionID.cpp */; };
> 		A3C66CDD1F462D6A009E6EE9 /* SessionID.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C66CDB1F462D6A009E6EE9 /* SessionID.h */; };
>+		CDF91113220E4EEC001EA39E /* CelestialSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF91112220E4EEC001EA39E /* CelestialSPI.h */; };
> 		CE5673872151A7B9002F92D7 /* IOKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE5673862151A7B9002F92D7 /* IOKitSPI.h */; };
> 		E5D45D122106A07400D2B738 /* NSColorWellSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5D45D112106A07400D2B738 /* NSColorWellSPI.h */; };
> 		E5D45D142106A18700D2B738 /* NSPopoverColorWellSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5D45D132106A18700D2B738 /* NSPopoverColorWellSPI.h */; };
>@@ -317,6 +318,7 @@
> 		A3C66CDA1F462D6A009E6EE9 /* SessionID.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SessionID.cpp; sourceTree = "<group>"; };
> 		A3C66CDB1F462D6A009E6EE9 /* SessionID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionID.h; sourceTree = "<group>"; };
> 		C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CopyPALHeaders.xcconfig; sourceTree = "<group>"; };
>+		CDF91112220E4EEC001EA39E /* CelestialSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelestialSPI.h; sourceTree = "<group>"; };
> 		CE5673862151A7B9002F92D7 /* IOKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOKitSPI.h; sourceTree = "<group>"; };
> 		E5D45D112106A07400D2B738 /* NSColorWellSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSColorWellSPI.h; sourceTree = "<group>"; };
> 		E5D45D132106A18700D2B738 /* NSPopoverColorWellSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSPopoverColorWellSPI.h; sourceTree = "<group>"; };
>@@ -427,6 +429,7 @@
> 		0C5AF90D1F43A4A4002EAC02 /* ios */ = {
> 			isa = PBXGroup;
> 			children = (
>+				CDF91112220E4EEC001EA39E /* CelestialSPI.h */,
> 				0C5AF90F1F43A4C7002EAC02 /* CoreUISPI.h */,
> 				0C5AF9101F43A4C7002EAC02 /* DataDetectorsUISPI.h */,
> 				0C5AF9111F43A4C7002EAC02 /* GraphicsServicesSPI.h */,
>@@ -671,6 +674,7 @@
> 				2D02E93C2056FAA700A13797 /* AudioToolboxSPI.h in Headers */,
> 				0C7785891F45130F00F4EBB6 /* AVFoundationSPI.h in Headers */,
> 				0C2DA13E1F3BEB4900DBC317 /* AVKitSPI.h in Headers */,
>+				CDF91113220E4EEC001EA39E /* CelestialSPI.h in Headers */,
> 				0C2DA06D1F33CA8400DBC317 /* CFLocaleSPI.h in Headers */,
> 				0C2DA06E1F33CA8400DBC317 /* CFNetworkConnectionCacheSPI.h in Headers */,
> 				0C2DA06F1F33CA8400DBC317 /* CFNetworkSPI.h in Headers */,
>diff --git a/Source/WebCore/PAL/pal/spi/ios/CelestialSPI.h b/Source/WebCore/PAL/pal/spi/ios/CelestialSPI.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..7e54ba9f0d58c9e41648863fea2ed3accbf9a02a
>--- /dev/null
>+++ b/Source/WebCore/PAL/pal/spi/ios/CelestialSPI.h
>@@ -0,0 +1,49 @@
>+/*
>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#if PLATFORM(IOS_FAMILY)
>+
>+#pragma once
>+
>+#import <Foundation/Foundation.h>
>+
>+#if USE(APPLE_INTERNAL_SDK)
>+
>+#import <Celestial/AVSystemController.h>
>+
>+#else
>+
>+@interface AVSystemController : NSObject
>+
>++(AVSystemController*)sharedAVSystemController;
>+
>+- (id)attributeForKey:(NSString *)attributeKey;
>+- (BOOL)setAttribute:(id)value forKey:(NSString *)attributeKey error:(NSError **)errorPtr;
>+
>+@end
>+
>+#endif
>+
>+#endif // PLATFORM(IOS_FAMILY)
>diff --git a/Source/WebCore/platform/audio/PlatformMediaSessionManager.h b/Source/WebCore/platform/audio/PlatformMediaSessionManager.h
>index 065d94fedc895ad6edd5bdae20046cab2260d8f2..45c70520b7d9a32f6bd92ce78e3f6eff4f86d33a 100644
>--- a/Source/WebCore/platform/audio/PlatformMediaSessionManager.h
>+++ b/Source/WebCore/platform/audio/PlatformMediaSessionManager.h
>@@ -64,6 +64,7 @@ public:
>     virtual double lastUpdatedNowPlayingElapsedTime() const { return NAN; }
>     virtual uint64_t lastUpdatedNowPlayingInfoUniqueIdentifier() const { return 0; }
>     virtual bool registeredAsNowPlayingApplication() const { return false; }
>+    virtual void prepareToSendUserMediaPermissionRequest() { }
> 
>     bool willIgnoreSystemInterruptions() const { return m_willIgnoreSystemInterruptions; }
>     void setWillIgnoreSystemInterruptions(bool ignore) { m_willIgnoreSystemInterruptions = ignore; }
>diff --git a/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.h b/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.h
>index 47c1fdfc9f80eb9460f53e11c3b8627c7bd1908c..1d3a2ffad04a5910bfd432a3157a79946eafc925 100644
>--- a/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.h
>+++ b/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.h
>@@ -57,12 +57,14 @@ protected:
>     void clientCharacteristicsChanged(PlatformMediaSession&) override;
>     void sessionCanProduceAudioChanged(PlatformMediaSession&) override;
> 
>+    void providePresentingApplicationPIDIfNecessary();
>+
>     PlatformMediaSession* nowPlayingEligibleSession();
> 
> private:
>     bool m_nowPlayingActive { false };
>     bool m_registeredAsNowPlayingApplication { false };
>-    
>+
>     // For testing purposes only.
>     String m_lastUpdatedNowPlayingTitle;
>     double m_lastUpdatedNowPlayingDuration { NAN };
>diff --git a/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm b/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm
>index cb3dfc77d411f3a83fee32a9942236335b1a88e7..7335b8535ac5a12dc1424b1a487481913ffea619 100644
>--- a/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm
>+++ b/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm
>@@ -34,6 +34,7 @@
> #include "Logging.h"
> #include "MediaPlayer.h"
> #include "PlatformMediaSession.h"
>+#include "RuntimeApplicationChecks.h"
> #include <wtf/BlockObjCExceptions.h>
> #include <wtf/Function.h>
> 
>@@ -120,6 +121,11 @@ void MediaSessionManagerCocoa::beginInterruption(PlatformMediaSession::Interrupt
>     PlatformMediaSessionManager::beginInterruption(type);
> }
> 
>+void MediaSessionManagerCocoa::prepareToSendUserMediaPermissionRequest()
>+{
>+    providePresentingApplicationPIDIfNecessary();
>+}
>+
> void MediaSessionManagerCocoa::scheduleUpdateNowPlayingInfo()
> {
>     if (!m_nowPlayingUpdateTaskQueue.hasPendingTasks())
>@@ -216,6 +222,7 @@ void MediaSessionManagerCocoa::updateNowPlayingInfo()
> 
>     if (!m_registeredAsNowPlayingApplication) {
>         m_registeredAsNowPlayingApplication = true;
>+        providePresentingApplicationPIDIfNecessary();
>         MRMediaRemoteSetCanBeNowPlayingApplication(true);
>     }
> 
>diff --git a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h
>index 02ceec0535933e2152e3e274c82ac91d00b7fb7e..0c1d1ff6e2d7d54dccdfa8db08599fd98e5b85d6 100644
>--- a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h
>+++ b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h
>@@ -56,8 +56,10 @@ private:
>     void resetRestrictions() override;
> 
>     void configureWireLessTargetMonitoring() override;
>+    void prepareToSendUserMediaPermissionRequest() final;
> 
>     RetainPtr<WebMediaSessionHelper> m_objcObserver;
>+    bool m_havePresentedApplicationPID { false };
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
>index f3e40456fde6dd6e21f35825b430c71ca7f17192..2f577e26c6940a61d6ad0a13437636da54545952 100644
>--- a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
>+++ b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
>@@ -37,6 +37,7 @@
> #import <AVFoundation/AVRouteDetector.h>
> #import <objc/runtime.h>
> #import <pal/ios/UIKitSoftLink.h>
>+#import <pal/spi/ios/CelestialSPI.h>
> #import <pal/spi/ios/UIKitSPI.h>
> #import <wtf/BlockObjCExceptions.h>
> #import <wtf/MainThread.h>
>@@ -50,6 +51,10 @@ SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionInterruptionTypeKey, NSString *)
> SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionInterruptionOptionKey, NSString *)
> SOFT_LINK_CONSTANT(AVFoundation, AVRouteDetectorMultipleRoutesDetectedDidChangeNotification, NSString *)
> 
>+SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(Celestial)
>+SOFT_LINK_CLASS_OPTIONAL(Celestial, AVSystemController)
>+SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_PIDToInheritApplicationStateFrom, NSString *)
>+
> #if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
> SOFT_LINK_CLASS(AVFoundation, AVRouteDetector)
> #endif
>@@ -169,6 +174,21 @@ void MediaSessionManageriOS::configureWireLessTargetMonitoring()
> #endif
> }
> 
>+void MediaSessionManageriOS::providePresentingApplicationPIDIfNecessary()
>+{
>+    if (m_havePresentedApplicationPID)
>+        return;
>+    m_havePresentedApplicationPID = true;
>+
>+    if (!canLoadAVSystemController_PIDToInheritApplicationStateFrom())
>+        return;
>+
>+    NSError *error = nil;
>+    [[getAVSystemControllerClass() sharedAVSystemController] setAttribute:@(presentingApplicationPID()) forKey:getAVSystemController_PIDToInheritApplicationStateFrom() error:&error];
>+    if (error)
>+        WTFLogAlways("Failed to set up PID proxying: %s", error.localizedDescription.UTF8String);
>+}
>+
> void MediaSessionManageriOS::externalOutputDeviceAvailableDidChange()
> {
>     BEGIN_BLOCK_OBJC_EXCEPTIONS
>diff --git a/Source/WebKit/Platform/spi/ios/CelestialSPI.h b/Source/WebKit/Platform/spi/ios/CelestialSPI.h
>deleted file mode 100644
>index 7e54ba9f0d58c9e41648863fea2ed3accbf9a02a..0000000000000000000000000000000000000000
>--- a/Source/WebKit/Platform/spi/ios/CelestialSPI.h
>+++ /dev/null
>@@ -1,49 +0,0 @@
>-/*
>- * Copyright (C) 2017 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#if PLATFORM(IOS_FAMILY)
>-
>-#pragma once
>-
>-#import <Foundation/Foundation.h>
>-
>-#if USE(APPLE_INTERNAL_SDK)
>-
>-#import <Celestial/AVSystemController.h>
>-
>-#else
>-
>-@interface AVSystemController : NSObject
>-
>-+(AVSystemController*)sharedAVSystemController;
>-
>-- (id)attributeForKey:(NSString *)attributeKey;
>-- (BOOL)setAttribute:(id)value forKey:(NSString *)attributeKey error:(NSError **)errorPtr;
>-
>-@end
>-
>-#endif
>-
>-#endif // PLATFORM(IOS_FAMILY)
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index 3eacefc54b1bf154185874bc28a6f4743e2609bd..7513157668c5c414605cb673f6f3ecd773cc1fa1 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -1862,7 +1862,6 @@
> 		076E884F1A13CBC6005E90FC /* APIInjectedBundlePageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIInjectedBundlePageContextMenuClient.h; sourceTree = "<group>"; };
> 		07A5EBB91C7BA43E00B9CA69 /* WKFrameHandleRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKFrameHandleRef.cpp; sourceTree = "<group>"; };
> 		07A5EBBA1C7BA43E00B9CA69 /* WKFrameHandleRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameHandleRef.h; sourceTree = "<group>"; };
>-		07A8F3861E64A8F900B668E8 /* CelestialSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelestialSPI.h; sourceTree = "<group>"; };
> 		0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
> 		089C1667FE841158C02AAC07 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
> 		0E97D74C200E8FF300BF6643 /* SafeBrowsingSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SafeBrowsingSPI.h; sourceTree = "<group>"; };
>@@ -8686,7 +8685,6 @@
> 				2DB7667021B5E48A0045DDB1 /* AccessibilitySupportSPI.h */,
> 				CE1A0BCC1A48E6C60054EF74 /* AssertionServicesSPI.h */,
> 				CDA041F31ACE2105004A13EC /* BackBoardServicesSPI.h */,
>-				07A8F3861E64A8F900B668E8 /* CelestialSPI.h */,
> 				CE1A0BCD1A48E6C60054EF74 /* CorePDFSPI.h */,
> 				2D4AF0882044C3C4006C8817 /* FrontBoardServicesSPI.h */,
> 				CE1A0BCF1A48E6C60054EF74 /* ManagedConfigurationSPI.h */,
>diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebUserMediaClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebUserMediaClient.cpp
>index b45c1c917209a7c92827dd0802f52dd704e91bbf..8f667fcb3dfd1279698dacdd5b817c6d0886010f 100644
>--- a/Source/WebKit/WebProcess/WebCoreSupport/WebUserMediaClient.cpp
>+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebUserMediaClient.cpp
>@@ -42,7 +42,6 @@ void WebUserMediaClient::pageDestroyed()
> 
> void WebUserMediaClient::requestUserMediaAccess(UserMediaRequest& request)
> {
>-    m_page.prepareToSendUserMediaPermissionRequest();
>     m_page.userMediaPermissionRequestManager().startUserMediaRequest(request);
> }
> 
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>index de34617e40fc26758000fc4ec9b590d2c9acf449..b3e90af63a90fb51e8eaaa671e7eea38e4fe01a1 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>@@ -4025,12 +4025,6 @@ void WebPage::didReceiveNotificationPermissionDecision(uint64_t notificationID,
> 
> #if ENABLE(MEDIA_STREAM)
> 
>-#if !PLATFORM(IOS_FAMILY)
>-void WebPage::prepareToSendUserMediaPermissionRequest()
>-{
>-}
>-#endif
>-
> void WebPage::userMediaAccessWasGranted(uint64_t userMediaID, WebCore::CaptureDevice&& audioDevice, WebCore::CaptureDevice&& videoDevice, String&& mediaDeviceIdentifierHashSalt)
> {
>     m_userMediaPermissionRequestManager->userMediaAccessWasGranted(userMediaID, WTFMove(audioDevice), WTFMove(videoDevice), WTFMove(mediaDeviceIdentifierHashSalt));
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
>index 6062ad88bc9c13cc1fcc60bd7225452bafd5e222..aac3f6d6663fedaf6255932565973e2e9f791378 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
>@@ -584,7 +584,6 @@ public:
> 
> #if ENABLE(MEDIA_STREAM)
>     UserMediaPermissionRequestManager& userMediaPermissionRequestManager() { return m_userMediaPermissionRequestManager; }
>-    void prepareToSendUserMediaPermissionRequest();
>     void captureDevicesChanged();
> #endif
> 
>diff --git a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>index 7eb71ae912a93500b35893830b6e24a0636cd7ef..4fb4c22ed33a6b569033ec953137e5df577ec5d9 100644
>--- a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>+++ b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>@@ -122,13 +122,6 @@
> #import <wtf/cocoa/Entitlements.h>
> #import <wtf/text/TextStream.h>
> 
>-#if ENABLE(MEDIA_STREAM)
>-#import "CelestialSPI.h"
>-SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(Celestial)
>-SOFT_LINK_CLASS_OPTIONAL(Celestial, AVSystemController)
>-SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_PIDToInheritApplicationStateFrom, NSString *)
>-#endif
>-
> namespace WebKit {
> using namespace WebCore;
> 
>@@ -3155,22 +3148,6 @@ bool WebPage::platformPrefersTextLegibilityBasedZoomScaling() const
> #endif
> }
> 
>-#if ENABLE(MEDIA_STREAM)
>-void WebPage::prepareToSendUserMediaPermissionRequest()
>-{
>-    static std::once_flag once;
>-    std::call_once(once, [] {
>-        if (!canLoadAVSystemController_PIDToInheritApplicationStateFrom())
>-            return;
>-
>-        NSError *error = nil;
>-        [[getAVSystemControllerClass() sharedAVSystemController] setAttribute:@(WebCore::presentingApplicationPID()) forKey:getAVSystemController_PIDToInheritApplicationStateFrom() error:&error];
>-        if (error)
>-            WTFLogAlways("Failed to set up PID proxying: %s", error.localizedDescription.UTF8String);
>-    });
>-}
>-#endif
>-
> } // namespace WebKit
> 
> #endif // PLATFORM(IOS_FAMILY)

Actions: View | Formatted Diff | Diff

Attachments on bug 194504: 361692 | 361693 | 361697 | 361704