Diff
Modified: trunk/Source/WTF/ChangeLog (261092 => 261093)
--- trunk/Source/WTF/ChangeLog 2020-05-04 18:24:15 UTC (rev 261092)
+++ trunk/Source/WTF/ChangeLog 2020-05-04 18:26:41 UTC (rev 261093)
@@ -1,5 +1,14 @@
2020-05-04 Darin Adler <da...@apple.com>
+ Remove now-unneeded HAVE(MEDIA_PLAYER)
+ https://bugs.webkit.org/show_bug.cgi?id=211378
+
+ Reviewed by Alex Christensen.
+
+ * wtf/PlatformHave.h: Remove code that sets HAVE_MEDIA_PLAYER.
+
+2020-05-04 Darin Adler <da...@apple.com>
+
Remove unused HAVE(STRINGS_H)
https://bugs.webkit.org/show_bug.cgi?id=211377
Modified: trunk/Source/WTF/wtf/PlatformHave.h (261092 => 261093)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-05-04 18:24:15 UTC (rev 261092)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-05-04 18:26:41 UTC (rev 261093)
@@ -282,10 +282,6 @@
#endif
#if PLATFORM(COCOA)
-#define HAVE_MEDIA_PLAYER 1
-#endif
-
-#if PLATFORM(COCOA)
#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (261092 => 261093)
--- trunk/Source/WebCore/ChangeLog 2020-05-04 18:24:15 UTC (rev 261092)
+++ trunk/Source/WebCore/ChangeLog 2020-05-04 18:26:41 UTC (rev 261093)
@@ -1,3 +1,20 @@
+2020-05-04 Darin Adler <da...@apple.com>
+
+ Remove now-unneeded HAVE(MEDIA_PLAYER)
+ https://bugs.webkit.org/show_bug.cgi?id=211378
+
+ Reviewed by Alex Christensen.
+
+ * platform/RemoteCommandListener.cpp: Remove uneeded check for HAVE(MEDIA_PLAYER)
+ in code that already checks for Cocoa platforms explicitly.
+
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (WebCore::MediaSessionManageriOS::configureWireLessTargetMonitoring): Removed
+ check of HAVE(MEDIA_PLAYER) in a Cocoa-only source file.
+ * platform/ios/RemoteCommandListenerIOS.h: Ditto. Also removed #pragma once and
+ some other unnecessary things because this is only included in the .mm file below.
+ * platform/ios/RemoteCommandListenerIOS.mm: Ditto.
+
2020-05-04 Guillem Vinals <gvin...@apple.com>
WebGPU: Textures should be able to have OUTPUT_ATTACHMENT | SAMPLED usage flags
Modified: trunk/Source/WebCore/platform/RemoteCommandListener.cpp (261092 => 261093)
--- trunk/Source/WebCore/platform/RemoteCommandListener.cpp 2020-05-04 18:24:15 UTC (rev 261092)
+++ trunk/Source/WebCore/platform/RemoteCommandListener.cpp 2020-05-04 18:26:41 UTC (rev 261093)
@@ -28,11 +28,13 @@
namespace WebCore {
-#if (!PLATFORM(IOS_FAMILY) && !PLATFORM(MAC)) || !HAVE(MEDIA_PLAYER)
+#if !PLATFORM(COCOA)
+
std::unique_ptr<RemoteCommandListener> RemoteCommandListener::create(RemoteCommandListenerClient& client)
{
return makeUnique<RemoteCommandListener>(client);
}
+
#endif
}
Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (261092 => 261093)
--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2020-05-04 18:24:15 UTC (rev 261092)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2020-05-04 18:26:41 UTC (rev 261093)
@@ -86,7 +86,7 @@
void MediaSessionManageriOS::configureWireLessTargetMonitoring()
{
-#if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
+#if !PLATFORM(WATCHOS)
bool requiresMonitoring = anyOfSessions([] (auto& session) {
return session.requiresPlaybackTargetRouteMonitoring();
});
Modified: trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h (261092 => 261093)
--- trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h 2020-05-04 18:24:15 UTC (rev 261092)
+++ trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h 2020-05-04 18:26:41 UTC (rev 261093)
@@ -23,28 +23,21 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
+#if PLATFORM(IOS_FAMILY)
#include "RemoteCommandListener.h"
-
-#if PLATFORM(IOS_FAMILY) && HAVE(MEDIA_PLAYER)
-
#include <wtf/RetainPtr.h>
#include <wtf/WeakPtr.h>
-#ifndef __OBJC__
-typedef void *id;
-#endif
-
namespace WebCore {
-class RemoteCommandListenerIOS : public RemoteCommandListener, public CanMakeWeakPtr<RemoteCommandListenerIOS> {
+class RemoteCommandListenerIOS final : public RemoteCommandListener, public CanMakeWeakPtr<RemoteCommandListenerIOS> {
public:
RemoteCommandListenerIOS(RemoteCommandListenerClient&);
virtual ~RemoteCommandListenerIOS();
protected:
- void updateSupportedCommands() override;
+ void updateSupportedCommands() final;
RetainPtr<id> m_playTarget;
RetainPtr<id> m_pauseTarget;
@@ -56,4 +49,4 @@
}
-#endif // PLATFORM(IOS_FAMILY) && HAVE(MEDIA_PLAYER)
+#endif // PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm (261092 => 261093)
--- trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm 2020-05-04 18:24:15 UTC (rev 261092)
+++ trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm 2020-05-04 18:26:41 UTC (rev 261093)
@@ -26,7 +26,7 @@
#import "config.h"
#import "RemoteCommandListenerIOS.h"
-#if PLATFORM(IOS_FAMILY) && HAVE(MEDIA_PLAYER)
+#if PLATFORM(IOS_FAMILY)
#import <MediaPlayer/MPRemoteCommand.h>
#import <MediaPlayer/MPRemoteCommandCenter.h>
@@ -151,4 +151,4 @@
}
-#endif // PLATFORM(IOS_FAMILY) && HAVE(MEDIA_PLAYER)
+#endif // PLATFORM(IOS_FAMILY)
Modified: trunk/Tools/ChangeLog (261092 => 261093)
--- trunk/Tools/ChangeLog 2020-05-04 18:24:15 UTC (rev 261092)
+++ trunk/Tools/ChangeLog 2020-05-04 18:26:41 UTC (rev 261093)
@@ -1,3 +1,14 @@
+2020-05-04 Darin Adler <da...@apple.com>
+
+ Remove now-unneeded HAVE(MEDIA_PLAYER)
+ https://bugs.webkit.org/show_bug.cgi?id=211378
+
+ Reviewed by Alex Christensen.
+
+ * TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm:
+ (TestWebKitAPI::TEST): Removed HAVE(MEDIA_PLAYER) check since it's now always
+ true in Objective-C source files.
+
2020-05-04 Michael Catanzaro <mcatanz...@gnome.org>
[WPE][GTK] Should install python3-secretstorage
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm (261092 => 261093)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm 2020-05-04 18:24:15 UTC (rev 261092)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm 2020-05-04 18:26:41 UTC (rev 261093)
@@ -79,7 +79,7 @@
EXPECT_NE(PAL::getAVAudioRoutingArbiterClass(), nullptr);
#endif
-#if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
+#if !PLATFORM(WATCHOS)
EXPECT_NE(PAL::getAVRouteDetectorClass(), nullptr);
#endif
