Diff
Modified: trunk/Source/WebCore/ChangeLog (253940 => 253941)
--- trunk/Source/WebCore/ChangeLog 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebCore/ChangeLog 2019-12-30 00:35:52 UTC (rev 253941)
@@ -1,3 +1,18 @@
+2019-12-29 Peng Liu <[email protected]>
+
+ Tweak the format and comment in the code to support media in GPU process
+ https://bugs.webkit.org/show_bug.cgi?id=205631
+
+ Reviewed by Eric Carlson.
+
+ No new tests, no functional change.
+
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::platformLayer const):
+ (WebCore::MediaPlayerPrivateInterface::timedMetadata const):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata):
+
2019-12-29 Eric Carlson <[email protected]>
Cleanup media IPC encoders
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (253940 => 253941)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2019-12-30 00:35:52 UTC (rev 253941)
@@ -59,7 +59,7 @@
}
virtual void prepareToPlay() { }
- virtual PlatformLayer* platformLayer() const { return 0; }
+ virtual PlatformLayer* platformLayer() const { return nullptr; }
#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
virtual void setVideoFullscreenLayer(PlatformLayer*, WTF::Function<void()>&& completionHandler) { completionHandler(); }
@@ -71,7 +71,7 @@
#endif
#if PLATFORM(IOS_FAMILY)
- virtual NSArray *timedMetadata() const { return 0; }
+ virtual NSArray *timedMetadata() const { return nil; }
virtual String accessLog() const { return emptyString(); }
virtual String errorLog() const { return emptyString(); }
#endif
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (253940 => 253941)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2019-12-30 00:35:52 UTC (rev 253941)
@@ -1053,7 +1053,6 @@
dispatch_group_enter(metadataLoadingGroup.get());
auto weakThis = makeWeakPtr(*this);
[m_avAsset.get() loadValuesAsynchronouslyForKeys:assetMetadataKeyNames() completionHandler:^{
-
callOnMainThread([weakThis, metadataLoadingGroup] {
if (weakThis && [weakThis->m_avAsset.get() statusOfValueForKey:@"tracks" error:nil] == AVKeyValueStatusLoaded) {
for (AVAssetTrack *track in [weakThis->m_avAsset.get() tracks]) {
Modified: trunk/Source/WebKit/ChangeLog (253940 => 253941)
--- trunk/Source/WebKit/ChangeLog 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/ChangeLog 2019-12-30 00:35:52 UTC (rev 253941)
@@ -1,3 +1,25 @@
+2019-12-29 Peng Liu <[email protected]>
+
+ Tweak the format and comment in the code to support media in GPU process
+ https://bugs.webkit.org/show_bug.cgi?id=205631
+
+ Reviewed by Eric Carlson.
+
+ No new tests, no functional change.
+
+ * GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp:
+ (WebKit::RemoteMediaPlayerManagerProxy::logChannel const):
+ * GPUProcess/media/RemoteMediaPlayerManagerProxy.h:
+ * GPUProcess/media/RemoteMediaPlayerProxy.h:
+ * GPUProcess/media/RemoteMediaPlayerProxyConfiguration.h:
+ * WebProcess/GPU/GPUProcessConnectionInfo.h:
+ * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+ * WebProcess/GPU/media/MediaPlayerPrivateRemoteIdentifier.h:
+ * WebProcess/GPU/media/RemoteMediaPlayerConfiguration.h:
+ * WebProcess/GPU/media/RemoteMediaPlayerManager.cpp:
+ * WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in:
+ * WebProcess/GPU/media/RemoteMediaPlayerState.h:
+
2019-12-29 Eric Carlson <[email protected]>
Cleanup media IPC encoders
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp (253940 => 253941)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp 2019-12-30 00:35:52 UTC (rev 253941)
@@ -250,11 +250,11 @@
WTFLogChannel& RemoteMediaPlayerManagerProxy::logChannel() const
{
- return WebKit2LogWebRTC;
+ return WebKit2LogMedia;
}
#endif
-}
+} // namespace WebKit
#undef MESSAGE_CHECK_CONTEXTID
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.h (253940 => 253941)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.h 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.h 2019-12-30 00:35:52 UTC (rev 253941)
@@ -106,6 +106,6 @@
#endif
};
-}
+} // namespace WebKit
#endif
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h (253940 => 253941)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h 2019-12-30 00:35:52 UTC (rev 253941)
@@ -191,6 +191,6 @@
#endif
};
-}
+} // namespace WebKit
#endif
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxyConfiguration.h (253940 => 253941)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxyConfiguration.h 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxyConfiguration.h 2019-12-30 00:35:52 UTC (rev 253941)
@@ -135,6 +135,6 @@
}
};
-}
+} // namespace WebKit
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnectionInfo.h (253940 => 253941)
--- trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnectionInfo.h 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnectionInfo.h 2019-12-30 00:35:52 UTC (rev 253941)
@@ -70,6 +70,6 @@
}
};
-};
+} // namespace WebKit
#endif // ENABLE(GPU_PROCESS)
Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (253940 => 253941)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2019-12-30 00:35:52 UTC (rev 253941)
@@ -47,7 +47,6 @@
#endif
namespace WebKit {
-using namespace PAL;
using namespace WebCore;
#ifdef ALWAYS_LOG_UNIMPLEMENTED_METHODS
@@ -806,6 +805,6 @@
}
#endif
-} // namespace WebCore
+} // namespace WebKit
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemoteIdentifier.h (253940 => 253941)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemoteIdentifier.h 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemoteIdentifier.h 2019-12-30 00:35:52 UTC (rev 253941)
@@ -32,4 +32,4 @@
enum MediaPlayerPrivateRemoteIdentifierType { };
using MediaPlayerPrivateRemoteIdentifier = ObjectIdentifier<MediaPlayerPrivateRemoteIdentifierType>;
-} // namespace WebCore
+} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerConfiguration.h (253940 => 253941)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerConfiguration.h 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerConfiguration.h 2019-12-30 00:35:52 UTC (rev 253941)
@@ -95,6 +95,6 @@
}
};
-}
+} // namespace WebKit
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.cpp (253940 => 253941)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.cpp 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.cpp 2019-12-30 00:35:52 UTC (rev 253941)
@@ -288,6 +288,6 @@
return WebProcess::singleton().ensureGPUProcessConnection().connection();
}
-}
+} // namespace WebKit
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in (253940 => 253941)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.messages.in 2019-12-30 00:35:52 UTC (rev 253941)
@@ -24,7 +24,6 @@
#if ENABLE(VIDEO)
messages -> RemoteMediaPlayerManager NotRefCounted {
-
NetworkStateChanged(WebKit::MediaPlayerPrivateRemoteIdentifier id, struct WebKit::RemoteMediaPlayerState state)
ReadyStateChanged(WebKit::MediaPlayerPrivateRemoteIdentifier id, struct WebKit::RemoteMediaPlayerState state)
VolumeChanged(WebKit::MediaPlayerPrivateRemoteIdentifier id, double volume)
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerState.h (253940 => 253941)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerState.h 2019-12-29 21:55:51 UTC (rev 253940)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerState.h 2019-12-30 00:35:52 UTC (rev 253941)
@@ -109,6 +109,6 @@
};
-}
+} // namespace WebKit
#endif
