Skip to content

Commit

Permalink
[tvOS 16] Support building WebKit
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=245095

Reviewed by Jonathan Bedard, Kimmo Kinnunen and Alex Christensen.

* Source/WebCore/PAL/pal/spi/cocoa/MetalSPI.h: The use site for
  MTLSharedTextureHandle is behind a !PLATFORM(IOS_FAMILY_SIMULATOR)
  block, but this SPI declaration was not.

* Source/WebKit/Scripts/webkit/messages.py: Move
  RemoteMediaSourceIdentifier, RemoteSourceBufferIdentifier,
  XRDeviceIdentifier to types_that_cannot_be_forward_declared. These
  symbols are not always available (in this case when building tvOS), so
  they cannot be generated as part of IPC::serializedIdentifiers.

* Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp:
(IPC::serializedIdentifiers): Regenerated.

Canonical link: https://commits.webkit.org/254459@main
  • Loading branch information
emw-apple committed Sep 13, 2022
1 parent 466a830 commit 1da4d67
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
2 changes: 2 additions & 0 deletions Source/WebCore/PAL/pal/spi/cocoa/MetalSPI.h
Expand Up @@ -44,8 +44,10 @@ typedef struct __IOSurface *IOSurfaceRef;
- (void)_purgeDevice;
@end

#if !PLATFORM(IOS_FAMILY_SIMULATOR)
@interface MTLSharedTextureHandle(Private)
- (instancetype)initWithIOSurface:(IOSurfaceRef)ioSurface label:(NSString*)label;
@end
#endif

#endif
6 changes: 3 additions & 3 deletions Source/WebKit/Scripts/webkit/messages.py
Expand Up @@ -314,10 +314,8 @@ def serialized_identifiers():
'WebKit::RemoteLegacyCDMIdentifier',
'WebKit::RemoteLegacyCDMSessionIdentifier',
'WebKit::RemoteMediaResourceIdentifier',
'WebKit::RemoteMediaSourceIdentifier',
'WebKit::RemoteVideoFrameIdentifier',
'WebKit::RemoteRemoteCommandListenerIdentifier',
'WebKit::RemoteSourceBufferIdentifier',
'WebKit::RenderingBackendIdentifier',
'WebKit::SampleBufferDisplayLayerIdentifier',
'WebKit::StorageAreaIdentifier',
Expand All @@ -330,7 +328,6 @@ def serialized_identifiers():
'WebKit::WebGPUIdentifier',
'WebKit::WebPageProxyIdentifier',
'WebKit::WebURLSchemeHandlerIdentifier',
'WebKit::XRDeviceIdentifier',
]


Expand Down Expand Up @@ -377,13 +374,16 @@ def types_that_cannot_be_forward_declared():
'WebKit::ImageBufferBackendHandle',
'WebKit::LayerHostingContextID',
'WebKit::LegacyCustomProtocolID',
'WebKit::RemoteMediaSourceIdentifier',
'WebKit::RemoteSourceBufferIdentifier',
'WebKit::RemoteVideoFrameWriteReference',
'WebKit::RemoteVideoFrameReadReference',
'WebKit::RenderingUpdateID',
'WebKit::TextCheckerRequestID',
'WebKit::TransactionID',
'WebKit::WCLayerTreeHostIdentifier',
'WebKit::WCContentBufferIdentifier',
'WebKit::XRDeviceIdentifier',
] + serialized_identifiers())


Expand Down
Expand Up @@ -55,9 +55,7 @@
#include "RemoteLegacyCDMIdentifier.h"
#include "RemoteLegacyCDMSessionIdentifier.h"
#include "RemoteMediaResourceIdentifier.h"
#include "RemoteMediaSourceIdentifier.h"
#include "RemoteRemoteCommandListenerIdentifier.h"
#include "RemoteSourceBufferIdentifier.h"
#include "RemoteVideoFrameIdentifier.h"
#include "RenderingBackendIdentifier.h"
#include "SampleBufferDisplayLayerIdentifier.h"
Expand All @@ -70,7 +68,6 @@
#include "WebGPUIdentifier.h"
#include "WebPageProxyIdentifier.h"
#include "WebURLSchemeHandlerIdentifier.h"
#include "XRDeviceIdentifier.h"
#include <WebCore/BroadcastChannelIdentifier.h>
#include <WebCore/DisplayList.h>
#include <WebCore/FetchIdentifier.h>
Expand Down Expand Up @@ -429,10 +426,8 @@ Vector<ASCIILiteral> serializedIdentifiers()
static_assert(sizeof(uint64_t) == sizeof(WebKit::RemoteLegacyCDMIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::RemoteLegacyCDMSessionIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::RemoteMediaResourceIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::RemoteMediaSourceIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::RemoteVideoFrameIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::RemoteRemoteCommandListenerIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::RemoteSourceBufferIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::RenderingBackendIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::SampleBufferDisplayLayerIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::StorageAreaIdentifier));
Expand All @@ -445,7 +440,6 @@ Vector<ASCIILiteral> serializedIdentifiers()
static_assert(sizeof(uint64_t) == sizeof(WebKit::WebGPUIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::WebPageProxyIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::WebURLSchemeHandlerIdentifier));
static_assert(sizeof(uint64_t) == sizeof(WebKit::XRDeviceIdentifier));
return {
"WebCore::BroadcastChannelIdentifier"_s,
"WebCore::DisplayList::ItemBufferIdentifier"_s,
Expand Down Expand Up @@ -504,10 +498,8 @@ Vector<ASCIILiteral> serializedIdentifiers()
"WebKit::RemoteLegacyCDMIdentifier"_s,
"WebKit::RemoteLegacyCDMSessionIdentifier"_s,
"WebKit::RemoteMediaResourceIdentifier"_s,
"WebKit::RemoteMediaSourceIdentifier"_s,
"WebKit::RemoteVideoFrameIdentifier"_s,
"WebKit::RemoteRemoteCommandListenerIdentifier"_s,
"WebKit::RemoteSourceBufferIdentifier"_s,
"WebKit::RenderingBackendIdentifier"_s,
"WebKit::SampleBufferDisplayLayerIdentifier"_s,
"WebKit::StorageAreaIdentifier"_s,
Expand All @@ -520,7 +512,6 @@ Vector<ASCIILiteral> serializedIdentifiers()
"WebKit::WebGPUIdentifier"_s,
"WebKit::WebPageProxyIdentifier"_s,
"WebKit::WebURLSchemeHandlerIdentifier"_s,
"WebKit::XRDeviceIdentifier"_s,
};
}

Expand Down

0 comments on commit 1da4d67

Please sign in to comment.