Attachment 343544 Details for Bug 187011 – Patch for landing

[patch] Patch for landing

bug-187011-20180625144701.patch (text/plain), 3.20 KB, created by Wenson Hsieh on 2018-06-25 14:47:02 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-06-25 14:47:02 PDT

Size: 3.20 KB

patch

obsolete

>Subversion Revision: 233168
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 041728d2f48537e7d98007b39e98d85e309af9b8..ee512e21b12aae3ea3f291bda6eecc284ca0e54a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-06-25  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [iPad apps on macOS] Web process crashes when attempting to play embedded YouTube video in News
>+        https://bugs.webkit.org/show_bug.cgi?id=187011
>+        <rdar://problem/40906808>
>+
>+        Reviewed by Tim Horton.
>+
>+        Disable remote media commands when running iOS WebKit on macOS. The iOS flavor of RemoteCommandListener
>+        currently throws an exception when attempting to soft-link the MediaPlayer framework, which prevents video from
>+        being played altogether. For a followup tracking touch bar integration in iOS WebKit on macOS, see:
>+        <rdar://problem/39164732>.
>+
>+        Manually tested by playing a YouTube video in News.
>+
>+        * platform/RemoteCommandListener.cpp:
>+        * platform/ios/RemoteCommandListenerIOS.h:
>+        * platform/ios/RemoteCommandListenerIOS.mm:
>+
> 2018-06-25  Antoine Quint  <graouts@apple.com>
> 
>         REGRESSION: hardware-accelerated animation fails on inline element
>diff --git a/Source/WebCore/platform/RemoteCommandListener.cpp b/Source/WebCore/platform/RemoteCommandListener.cpp
>index 038d794de6474675d629d873b4e15c087f13b616..978a094ef119dc53851415df7b2a2a9817794ff2 100644
>--- a/Source/WebCore/platform/RemoteCommandListener.cpp
>+++ b/Source/WebCore/platform/RemoteCommandListener.cpp
>@@ -28,7 +28,7 @@
> 
> namespace WebCore {
> 
>-#if !PLATFORM(IOS) && !PLATFORM(MAC)
>+#if (!PLATFORM(IOS) && !PLATFORM(MAC)) || !HAVE(MEDIA_PLAYER)
> std::unique_ptr<RemoteCommandListener> RemoteCommandListener::create(RemoteCommandListenerClient& client)
> {
>     return std::make_unique<RemoteCommandListener>(client);
>diff --git a/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h b/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h
>index f8b141b4dac317dd88b5af80ffcc1c9b18048489..2829982444ce3fa908891234814c8aa0bdb14016 100644
>--- a/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h
>+++ b/Source/WebCore/platform/ios/RemoteCommandListenerIOS.h
>@@ -27,7 +27,7 @@
> 
> #include "RemoteCommandListener.h"
> 
>-#if PLATFORM(IOS)
>+#if PLATFORM(IOS) && HAVE(MEDIA_PLAYER)
> 
> #include <wtf/RetainPtr.h>
> #include <wtf/WeakPtr.h>
>@@ -56,4 +56,4 @@ protected:
> 
> }
> 
>-#endif // PLATFORM(IOS)
>+#endif // PLATFORM(IOS) && HAVE(MEDIA_PLAYER)
>diff --git a/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm b/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm
>index 9ae7739c52ded53b759a31f146428b656db6807d..81ff302f72f77d57636037b435bab7e64d457ddf 100644
>--- a/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm
>+++ b/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm
>@@ -26,7 +26,7 @@
> #import "config.h"
> #import "RemoteCommandListenerIOS.h"
> 
>-#if PLATFORM(IOS)
>+#if PLATFORM(IOS) && HAVE(MEDIA_PLAYER)
> 
> #import <MediaPlayer/MPRemoteCommand.h>
> #import <MediaPlayer/MPRemoteCommandCenter.h>
>@@ -151,4 +151,4 @@ void RemoteCommandListenerIOS::updateSupportedCommands()
> 
> }
> 
>-#endif // PLATFORM(IOS)
>+#endif // PLATFORM(IOS) && HAVE(MEDIA_PLAYER)

Actions: View | Formatted Diff | Diff

Attachments on bug 187011: 343529 | 343544 | 343548