Diff
Modified: trunk/Source/WebKit/ChangeLog (263489 => 263490)
--- trunk/Source/WebKit/ChangeLog 2020-06-25 01:31:38 UTC (rev 263489)
+++ trunk/Source/WebKit/ChangeLog 2020-06-25 01:43:05 UTC (rev 263490)
@@ -1,3 +1,21 @@
+2020-06-24 David Kilzer <ddkil...@apple.com>
+
+ [IPC] Use WebKit::LayerHostingContextID instead of uint32_t for videoLayerID
+ <https://webkit.org/b/213576>
+ <rdar://problem/61806253>
+
+ Reviewed by Darin Adler.
+
+ Use WebKit::LayerHostingContextID instead of uint32_t as type
+ for videoLayerID since the value comes from
+ LayerHostingContext::contextID() in
+ VideoFullscreenManager::enterVideoFullscreenForVideoElement().
+
+ * UIProcess/Cocoa/VideoFullscreenManagerProxy.h:
+ * UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in:
+ * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+ (WebKit::VideoFullscreenManagerProxy::setupFullscreenWithID):
+
2020-06-24 Tim Horton <timothy_hor...@apple.com>
Cannot play back any video on Apple Silicon devices
Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h (263489 => 263490)
--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h 2020-06-25 01:31:38 UTC (rev 263489)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h 2020-06-25 01:43:05 UTC (rev 263490)
@@ -27,6 +27,7 @@
#if ENABLE(VIDEO_PRESENTATION_MODE)
+#include "LayerHostingContext.h"
#include "MessageReceiver.h"
#include "PlaybackSessionContextIdentifier.h"
#include <WebCore/AudioSession.h>
@@ -159,7 +160,7 @@
void hasVideoInPictureInPictureDidChange(bool);
// Messages from VideoFullscreenManager
- void setupFullscreenWithID(PlaybackSessionContextIdentifier, uint32_t videoLayerID, const WebCore::IntRect& initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool allowsPictureInPicture, bool standby);
+ void setupFullscreenWithID(PlaybackSessionContextIdentifier, WebKit::LayerHostingContextID videoLayerID, const WebCore::IntRect& initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool allowsPictureInPicture, bool standby);
void setInlineRect(PlaybackSessionContextIdentifier, const WebCore::IntRect& inlineRect, bool visible);
void setHasVideoContentLayer(PlaybackSessionContextIdentifier, bool value);
void setHasVideo(PlaybackSessionContextIdentifier, bool);
Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in (263489 => 263490)
--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in 2020-06-25 01:31:38 UTC (rev 263489)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in 2020-06-25 01:43:05 UTC (rev 263490)
@@ -24,7 +24,7 @@
messages -> VideoFullscreenManagerProxy {
SetHasVideo(WebKit::PlaybackSessionContextIdentifier contextId, bool hasVideo)
SetVideoDimensions(WebKit::PlaybackSessionContextIdentifier contextId, WebCore::FloatSize videoDimensions)
- SetupFullscreenWithID(WebKit::PlaybackSessionContextIdentifier contextId, uint32_t videoLayerID, WebCore::IntRect initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby)
+ SetupFullscreenWithID(WebKit::PlaybackSessionContextIdentifier contextId, WebKit::LayerHostingContextID videoLayerID, WebCore::IntRect initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby)
EnterFullscreen(WebKit::PlaybackSessionContextIdentifier contextId)
ExitFullscreen(WebKit::PlaybackSessionContextIdentifier contextId, WebCore::IntRect finalRect)
SetInlineRect(WebKit::PlaybackSessionContextIdentifier contextId, WebCore::IntRect inlineRect, bool visible)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (263489 => 263490)
--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2020-06-25 01:31:38 UTC (rev 263489)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2020-06-25 01:43:05 UTC (rev 263490)
@@ -506,7 +506,7 @@
#pragma mark Messages from VideoFullscreenManager
-void VideoFullscreenManagerProxy::setupFullscreenWithID(PlaybackSessionContextIdentifier contextId, uint32_t videoLayerID, const WebCore::IntRect& initialRect, float hostingDeviceScaleFactor, HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby)
+void VideoFullscreenManagerProxy::setupFullscreenWithID(PlaybackSessionContextIdentifier contextId, WebKit::LayerHostingContextID videoLayerID, const WebCore::IntRect& initialRect, float hostingDeviceScaleFactor, HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby)
{
MESSAGE_CHECK(videoLayerID);