Changeset 290663 in webkit

Timestamp:

Mar 1, 2022, 11:34:43 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r290619.
​https://bugs.webkit.org/show_bug.cgi?id=237337

Introduced build failure

Reverted changeset:

"[iOS] Weak link AVPictureInPictureController"
​https://bugs.webkit.org/show_bug.cgi?id=237227
​https://commits.webkit.org/r290619

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/WebCore.xcconfig (modified) (1 diff)
• platform/ios/VideoFullscreenInterfaceAVKit.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-01  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r290619.
+        https://bugs.webkit.org/show_bug.cgi?id=237337
+
+        Introduced build failure
+
+        Reverted changeset:
+
+        "[iOS] Weak link AVPictureInPictureController"
+        https://bugs.webkit.org/show_bug.cgi?id=237227
+        https://commits.webkit.org/r290619
+
 2022-03-01  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/Configurations/WebCore.xcconfig

@@ -145 +145 @@
 WK_SCENEKIT_LDFLAGS_macosx = -weak_framework SceneKit;
 
-WK_AVKIT_LDFLAGS = $(WK_AVKIT_LDFLAGS_$(WK_PLATFORM_NAME));
-WK_AVKIT_LDFLAGS_iphoneos = -weak_framework AVKit;
-WK_AVKIT_LDFLAGS_iphonesimulator =  -weak_framework AVKit;
-
 // FIXME: Reduce the number of allowable_clients <rdar://problem/31823969>
-OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_ANGLE_LDFLAGS) $(WK_WEBGPU_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LD_FLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_SCENEKIT_LDFLAGS) $(SOURCE_VERSION_LDFLAGS) $(WK_AVKIT_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_ANGLE_LDFLAGS) $(WK_WEBGPU_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LD_FLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_SCENEKIT_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 
 OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI;

trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm

@@ -39 +39 @@
 #import "WebAVPlayerController.h"
 #import <AVFoundation/AVTime.h>
-#import <AVKit/AVPictureInPictureController.h>
 #import <UIKit/UIKit.h>
 #import <UIKit/UIWindow.h>
@@ -62 +61 @@
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVObservationController)
 #endif
+SOFT_LINK_CLASS_OPTIONAL(AVKit, AVPictureInPictureController)
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVPlayerViewController)
 SOFT_LINK_CLASS_OPTIONAL(AVKit, __AVPlayerLayerView)
@@ -1644 +1644 @@
     if (isPictureInPictureSupported.has_value())
         return *isPictureInPictureSupported;
-    return [AVPictureInPictureController isPictureInPictureSupported];
+    return [getAVPictureInPictureControllerClass() isPictureInPictureSupported];
 #else
     return false;