Title: [268533] branches/safari-610-branch/Source/WebCore
Revision
268533
Author
[email protected]
Date
2020-10-15 11:07:45 -0700 (Thu, 15 Oct 2020)

Log Message

Cherry-pick r268308. rdar://problem/70321629

    [Mac] AirPlay menu does not show up when AirPlay button is clicked
    https://bugs.webkit.org/show_bug.cgi?id=217536
    <rdar://problem/69973777>

    Reviewed by Eric Carlson.

    Source/WebCore:

    PAL tries to soft-link the AVRoutePickerView from the AVFoundation framework, rather than the (correct)
    AVKit framework. Remove AVRoutePickerView from AVFoundationSoftLink.h and use the already declared version
    inside AVRoutePickerViewTargetPicker.mm.

    * platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm:
    (WebCore::AVRoutePickerViewTargetPicker::isAvailable):

    Source/WebCore/PAL:

    * pal/cocoa/AVFoundationSoftLink.h:
    * pal/cocoa/AVFoundationSoftLink.mm:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268308 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610-branch/Source/WebCore/ChangeLog (268532 => 268533)


--- branches/safari-610-branch/Source/WebCore/ChangeLog	2020-10-15 18:07:42 UTC (rev 268532)
+++ branches/safari-610-branch/Source/WebCore/ChangeLog	2020-10-15 18:07:45 UTC (rev 268533)
@@ -1,3 +1,45 @@
+2020-10-15  Russell Epstein  <[email protected]>
+
+        Cherry-pick r268308. rdar://problem/70321629
+
+    [Mac] AirPlay menu does not show up when AirPlay button is clicked
+    https://bugs.webkit.org/show_bug.cgi?id=217536
+    <rdar://problem/69973777>
+    
+    Reviewed by Eric Carlson.
+    
+    Source/WebCore:
+    
+    PAL tries to soft-link the AVRoutePickerView from the AVFoundation framework, rather than the (correct)
+    AVKit framework. Remove AVRoutePickerView from AVFoundationSoftLink.h and use the already declared version
+    inside AVRoutePickerViewTargetPicker.mm.
+    
+    * platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm:
+    (WebCore::AVRoutePickerViewTargetPicker::isAvailable):
+    
+    Source/WebCore/PAL:
+    
+    * pal/cocoa/AVFoundationSoftLink.h:
+    * pal/cocoa/AVFoundationSoftLink.mm:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268308 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-09  Jer Noble  <[email protected]>
+
+            [Mac] AirPlay menu does not show up when AirPlay button is clicked
+            https://bugs.webkit.org/show_bug.cgi?id=217536
+            <rdar://problem/69973777>
+
+            Reviewed by Eric Carlson.
+
+            PAL tries to soft-link the AVRoutePickerView from the AVFoundation framework, rather than the (correct)
+            AVKit framework. Remove AVRoutePickerView from AVFoundationSoftLink.h and use the already declared version
+            inside AVRoutePickerViewTargetPicker.mm.
+
+            * platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm:
+            (WebCore::AVRoutePickerViewTargetPicker::isAvailable):
+
 2020-10-08  Russell Epstein  <[email protected]>
 
         Cherry-pick r266909. rdar://problem/69101091

Modified: branches/safari-610-branch/Source/WebCore/PAL/ChangeLog (268532 => 268533)


--- branches/safari-610-branch/Source/WebCore/PAL/ChangeLog	2020-10-15 18:07:42 UTC (rev 268532)
+++ branches/safari-610-branch/Source/WebCore/PAL/ChangeLog	2020-10-15 18:07:45 UTC (rev 268533)
@@ -1,3 +1,41 @@
+2020-10-15  Russell Epstein  <[email protected]>
+
+        Cherry-pick r268308. rdar://problem/70321629
+
+    [Mac] AirPlay menu does not show up when AirPlay button is clicked
+    https://bugs.webkit.org/show_bug.cgi?id=217536
+    <rdar://problem/69973777>
+    
+    Reviewed by Eric Carlson.
+    
+    Source/WebCore:
+    
+    PAL tries to soft-link the AVRoutePickerView from the AVFoundation framework, rather than the (correct)
+    AVKit framework. Remove AVRoutePickerView from AVFoundationSoftLink.h and use the already declared version
+    inside AVRoutePickerViewTargetPicker.mm.
+    
+    * platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm:
+    (WebCore::AVRoutePickerViewTargetPicker::isAvailable):
+    
+    Source/WebCore/PAL:
+    
+    * pal/cocoa/AVFoundationSoftLink.h:
+    * pal/cocoa/AVFoundationSoftLink.mm:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268308 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-09  Jer Noble  <[email protected]>
+
+            [Mac] AirPlay menu does not show up when AirPlay button is clicked
+            https://bugs.webkit.org/show_bug.cgi?id=217536
+            <rdar://problem/69973777>
+
+            Reviewed by Eric Carlson.
+
+            * pal/cocoa/AVFoundationSoftLink.h:
+            * pal/cocoa/AVFoundationSoftLink.mm:
+
 2020-10-14  Alan Coon  <[email protected]>
 
         Cherry-pick r268371. rdar://problem/70267767

Modified: branches/safari-610-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h (268532 => 268533)


--- branches/safari-610-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h	2020-10-15 18:07:42 UTC (rev 268532)
+++ branches/safari-610-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h	2020-10-15 18:07:45 UTC (rev 268533)
@@ -82,10 +82,6 @@
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVAudioRoutingArbiter)
 #endif
 
-#if HAVE(AVROUTEPICKERVIEW)
-SOFT_LINK_CLASS_FOR_HEADER(PAL, AVRoutePickerView)
-#endif
-
 #if !PLATFORM(WATCHOS)
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVRouteDetector)
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVVideoPerformanceMetrics)

Modified: branches/safari-610-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm (268532 => 268533)


--- branches/safari-610-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm	2020-10-15 18:07:42 UTC (rev 268532)
+++ branches/safari-610-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm	2020-10-15 18:07:45 UTC (rev 268533)
@@ -113,10 +113,6 @@
 SOFT_LINK_CLASS_FOR_SOURCE_OPTIONAL_WITH_EXPORT(PAL, AVFoundation, AVVideoPerformanceMetrics, PAL_EXPORT)
 #endif
 
-#if HAVE(AVROUTEPICKERVIEW)
-SOFT_LINK_CLASS_FOR_SOURCE_OPTIONAL_WITH_EXPORT(PAL, AVFoundation, AVRoutePickerView, PAL_EXPORT)
-#endif
-
 #if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureConnection, PAL_EXPORT)
 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDevice, PAL_EXPORT)

Modified: branches/safari-610-branch/Source/WebCore/platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm (268532 => 268533)


--- branches/safari-610-branch/Source/WebCore/platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm	2020-10-15 18:07:42 UTC (rev 268532)
+++ branches/safari-610-branch/Source/WebCore/platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm	2020-10-15 18:07:45 UTC (rev 268533)
@@ -60,7 +60,7 @@
     static bool available;
     static std::once_flag flag;
     std::call_once(flag, [] () {
-        if (!PAL::getAVRoutePickerViewClass())
+        if (!getAVRoutePickerViewClass())
             return;
 
         if (auto picker = adoptNS([allocAVRoutePickerViewInstance() init]))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to