Diff
Modified: trunk/Source/WebKit/ChangeLog (281639 => 281640)
--- trunk/Source/WebKit/ChangeLog 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/ChangeLog 2021-08-26 19:03:13 UTC (rev 281640)
@@ -1,3 +1,42 @@
+2021-08-26 Myles C. Maxfield <[email protected]>
+
+ Clean up logging #includes
+ https://bugs.webkit.org/show_bug.cgi?id=229547
+
+ Reviewed by Eric Carlson.
+
+ It's actually harmful to include the wrong framework's Logging.h file,
+ because they conflict with each other. You'll end up with errors like
+ Unknown symbol "WebCore::WebKit2LogLayout".
+
+ No new tests because there is no behavior change.
+
+ * GPUProcess/GPUConnectionToWebProcess.cpp:
+ * GPUProcess/media/RemoteMediaPlayerProxy.cpp:
+ (WebKit::RemoteMediaPlayerProxy::logChannel const):
+ * Shared/mac/MediaFormatReader/MediaFormatReader.cpp:
+ (WebKit::logChannel):
+ * Shared/mac/MediaFormatReader/MediaSampleCursor.cpp:
+ (WebKit::MediaSampleCursor::logChannel const):
+ * Shared/mac/MediaFormatReader/MediaTrackReader.cpp:
+ (WebKit::MediaTrackReader::logChannel const):
+ * UIProcess/Media/RemoteMediaSessionCoordinatorProxy.cpp:
+ (WebKit::RemoteMediaSessionCoordinatorProxy::logChannel const):
+ * UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp:
+ (WebKit::logChannel):
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::logChannel const):
+ * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+ (WebKit::MediaPlayerPrivateRemote::logChannel const):
+ * WebProcess/GPU/media/MediaSourcePrivateRemote.cpp:
+ (WebKit::MediaSourcePrivateRemote::logChannel const):
+ * WebProcess/GPU/media/RemoteAudioSourceProvider.cpp:
+ (WebKit::RemoteAudioSourceProvider::logChannel const):
+ * WebProcess/GPU/media/SourceBufferPrivateRemote.cpp:
+ (WebKit::SourceBufferPrivateRemote::logChannel const):
+ * WebProcess/MediaSession/RemoteMediaSessionCoordinator.cpp:
+ (WebKit::RemoteMediaSessionCoordinator::logChannel const):
+
2021-08-26 Kimmo Kinnunen <[email protected]>
RemoteGraphicsContextGL refers to GraphicsContextGLOpenGL::SimulatedEventForTesting
Modified: trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp (281639 => 281640)
--- trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -65,7 +65,6 @@
#include "WebErrors.h"
#include "WebProcessMessages.h"
#include <WebCore/LogInitialization.h>
-#include <WebCore/Logging.h>
#include <WebCore/MockRealtimeMediaSourceCenter.h>
#include <WebCore/NowPlayingManager.h>
#include <wtf/Language.h>
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp (281639 => 281640)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -31,6 +31,7 @@
#include "DataReference.h"
#include "GPUConnectionToWebProcess.h"
#include "LayerHostingContext.h"
+#include "Logging.h"
#include "MediaPlayerPrivateRemoteMessages.h"
#include "RemoteAudioSourceProviderProxy.h"
#include "RemoteAudioTrackProxy.h"
@@ -48,7 +49,6 @@
#include "TrackPrivateRemoteConfiguration.h"
#include "WebCoreArgumentCoders.h"
#include <WebCore/LayoutRect.h>
-#include <WebCore/Logging.h>
#include <WebCore/MediaPlayer.h>
#include <WebCore/MediaPlayerPrivate.h>
#include <WebCore/NotImplemented.h>
@@ -1090,7 +1090,7 @@
#if !RELEASE_LOG_DISABLED
WTFLogChannel& RemoteMediaPlayerProxy::logChannel() const
{
- return WebCore::LogMedia;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, Media);
}
#endif
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaFormatReader.cpp (281639 => 281640)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaFormatReader.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaFormatReader.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -28,12 +28,12 @@
#if ENABLE(WEBM_FORMAT_READER)
+#include "Logging.h"
#include "MediaTrackReader.h"
#include <WebCore/AudioTrackPrivate.h>
#include <WebCore/ContentType.h>
#include <WebCore/Document.h>
#include <WebCore/InbandTextTrackPrivate.h>
-#include <WebCore/Logging.h>
#include <WebCore/MediaSample.h>
#include <WebCore/SourceBufferParserWebM.h>
#include <WebCore/VideoTrackPrivate.h>
@@ -55,7 +55,11 @@
return reinterpret_cast<const void*>(++logIdentifier);
}
-static WTFLogChannel& logChannel() { return WebCore::LogMedia; }
+static WTFLogChannel& logChannel()
+{
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, Media);
+}
+
static const char* logClassName() { return "MediaFormatReader"; }
class AbortAction {
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.cpp (281639 => 281640)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -28,8 +28,8 @@
#if ENABLE(WEBM_FORMAT_READER)
+#include "Logging.h"
#include "MediaTrackReader.h"
-#include <WebCore/Logging.h>
#include <WebCore/MediaSample.h>
#include <WebCore/SampleMap.h>
#include <pal/avfoundation/MediaTimeAVFoundation.h>
@@ -399,7 +399,7 @@
WTFLogChannel& MediaSampleCursor::logChannel() const
{
- return LogMedia;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, Media);
}
} // namespace WebKit
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.cpp (281639 => 281640)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -28,12 +28,12 @@
#if ENABLE(WEBM_FORMAT_READER)
+#include "Logging.h"
#include "MediaFormatReader.h"
#include "MediaSampleByteRange.h"
#include "MediaSampleCursor.h"
#include <WebCore/AudioTrackPrivate.h>
#include <WebCore/InbandTextTrackPrivate.h>
-#include <WebCore/Logging.h>
#include <WebCore/MediaDescription.h>
#include <WebCore/SampleMap.h>
#include <WebCore/VideoTrackPrivate.h>
@@ -233,7 +233,7 @@
WTFLogChannel& MediaTrackReader::logChannel() const
{
- return WebCore::LogMedia;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, Media);
}
const void* MediaTrackReader::nextSampleCursorLogIdentifier(uint64_t cursorID) const
Modified: trunk/Source/WebKit/UIProcess/Media/RemoteMediaSessionCoordinatorProxy.cpp (281639 => 281640)
--- trunk/Source/WebKit/UIProcess/Media/RemoteMediaSessionCoordinatorProxy.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/UIProcess/Media/RemoteMediaSessionCoordinatorProxy.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -28,6 +28,7 @@
#if ENABLE(MEDIA_SESSION_COORDINATOR)
+#include "Logging.h"
#include "MediaSessionCoordinatorProxyPrivate.h"
#include "RemoteMediaSessionCoordinatorMessages.h"
#include "RemoteMediaSessionCoordinatorProxyMessages.h"
@@ -182,7 +183,7 @@
#if !RELEASE_LOG_DISABLED
WTFLogChannel& RemoteMediaSessionCoordinatorProxy::logChannel() const
{
- return LogMedia;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, Media);
}
#endif
Modified: trunk/Source/WebKit/UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp (281639 => 281640)
--- trunk/Source/WebKit/UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -51,7 +51,7 @@
static WTFLogChannel& logChannel()
{
- return WebKit2LogEME;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, EME);
}
const Logger& MediaKeySystemPermissionRequestManagerProxy::logger() const
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (281639 => 281640)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -912,7 +912,7 @@
#if !RELEASE_LOG_DISABLED
WTFLogChannel& UserMediaPermissionRequestManagerProxy::logChannel() const
{
- return WebKit2LogWebRTC;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, WebRTC);
}
const Logger& UserMediaPermissionRequestManagerProxy::logger() const
Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (281639 => 281640)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -1396,7 +1396,7 @@
#if !RELEASE_LOG_DISABLED
WTFLogChannel& MediaPlayerPrivateRemote::logChannel() const
{
- return LogMedia;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, Media);
}
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaSourcePrivateRemote.cpp (281639 => 281640)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaSourcePrivateRemote.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaSourcePrivateRemote.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -197,7 +197,7 @@
#if !RELEASE_LOG_DISABLED
WTFLogChannel& MediaSourcePrivateRemote::logChannel() const
{
- return LogMedia;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, Media);
}
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSourceProvider.cpp (281639 => 281640)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSourceProvider.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSourceProvider.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -29,6 +29,7 @@
#if ENABLE(GPU_PROCESS) && ENABLE(WEB_AUDIO) && PLATFORM(COCOA)
#include "GPUProcessConnection.h"
+#include "Logging.h"
#include "RemoteAudioSourceProviderManager.h"
#include "RemoteMediaPlayerProxyMessages.h"
@@ -89,7 +90,7 @@
#if !RELEASE_LOG_DISABLED
WTFLogChannel& RemoteAudioSourceProvider::logChannel() const
{
- return LogMedia;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, Media);
}
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp (281639 => 281640)
--- trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/WebProcess/GPU/media/SourceBufferPrivateRemote.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -474,7 +474,7 @@
#if !RELEASE_LOG_DISABLED
WTFLogChannel& SourceBufferPrivateRemote::logChannel() const
{
- return LogMedia;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, Media);
}
#endif
Modified: trunk/Source/WebKit/WebProcess/MediaSession/RemoteMediaSessionCoordinator.cpp (281639 => 281640)
--- trunk/Source/WebKit/WebProcess/MediaSession/RemoteMediaSessionCoordinator.cpp 2021-08-26 18:52:16 UTC (rev 281639)
+++ trunk/Source/WebKit/WebProcess/MediaSession/RemoteMediaSessionCoordinator.cpp 2021-08-26 19:03:13 UTC (rev 281640)
@@ -28,6 +28,7 @@
#if ENABLE(MEDIA_SESSION_COORDINATOR)
+#include "Logging.h"
#include "RemoteMediaSessionCoordinatorMessages.h"
#include "RemoteMediaSessionCoordinatorProxyMessages.h"
#include "WebPage.h"
@@ -226,7 +227,7 @@
WTFLogChannel& RemoteMediaSessionCoordinator::logChannel() const
{
- return LogMedia;
+ return JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, Media);
}
