Diff
Modified: trunk/Source/WTF/ChangeLog (258690 => 258691)
--- trunk/Source/WTF/ChangeLog 2020-03-19 10:15:02 UTC (rev 258690)
+++ trunk/Source/WTF/ChangeLog 2020-03-19 10:26:23 UTC (rev 258691)
@@ -1,3 +1,10 @@
+2020-03-19 Philippe Normand <[email protected]>
+
+ [GTK][WPE] Unreviewed, build fixes after r258547 when disabling release logging support
+
+ * wtf/Logger.h:
+ (WTF::Logger::logAlwaysVerbose const):
+
2020-03-19 youenn fablet <[email protected]>
Make URL::path() return a StringView
Modified: trunk/Source/WTF/wtf/Logger.h (258690 => 258691)
--- trunk/Source/WTF/wtf/Logger.h 2020-03-19 10:15:02 UTC (rev 258690)
+++ trunk/Source/WTF/wtf/Logger.h 2020-03-19 10:26:23 UTC (rev 258691)
@@ -186,6 +186,9 @@
// "Standard" WebCore logging goes to stderr, which is captured in layout test output and can generally be a problem
// on some systems, so don't allow it.
UNUSED_PARAM(channel);
+ UNUSED_PARAM(file);
+ UNUSED_PARAM(function);
+ UNUSED_PARAM(line);
#else
if (!willLog(channel, WTFLogLevel::Always))
return;
Modified: trunk/Source/WebCore/ChangeLog (258690 => 258691)
--- trunk/Source/WebCore/ChangeLog 2020-03-19 10:15:02 UTC (rev 258690)
+++ trunk/Source/WebCore/ChangeLog 2020-03-19 10:26:23 UTC (rev 258691)
@@ -1,3 +1,12 @@
+2020-03-19 Philippe Normand <[email protected]>
+
+ [GTK][WPE] Unreviewed, build fixes after r258547 when disabling release logging support
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+ * platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.h:
+
2020-03-19 youenn fablet <[email protected]>
Make URL::path() return a StringView
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (258690 => 258691)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2020-03-19 10:15:02 UTC (rev 258690)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2020-03-19 10:26:23 UTC (rev 258691)
@@ -433,8 +433,10 @@
, m_platformLayerProxy(adoptRef(new TextureMapperPlatformLayerProxy()))
#endif
#endif
+#if !RELEASE_LOG_DISABLED
, m_logger(player->mediaPlayerLogger())
, m_logIdentifier(player->mediaPlayerLogIdentifier())
+#endif
{
#if USE(GLIB)
m_readyTimerHandler.setPriority(G_PRIORITY_DEFAULT_IDLE);
@@ -3839,10 +3841,12 @@
return result;
}
+#if !RELEASE_LOG_DISABLED
WTFLogChannel& MediaPlayerPrivateGStreamer::logChannel() const
{
return WebCore::LogMedia;
}
+#endif
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (258690 => 258691)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2020-03-19 10:15:02 UTC (rev 258690)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2020-03-19 10:26:23 UTC (rev 258691)
@@ -119,7 +119,9 @@
// Use eager initialization for the WeakPtrFactory since we call makeWeakPtr() from another thread.
class MediaPlayerPrivateGStreamer : public MediaPlayerPrivateInterface
, public CanMakeWeakPtr<MediaPlayerPrivateGStreamer, WeakPtrFactoryInitialization::Eager>
+#if !RELEASE_LOG_DISABLED
, private LoggerHelper
+#endif
#if USE(TEXTURE_MAPPER_GL)
#if USE(NICOSIA)
, public Nicosia::ContentLayerTextureMapperImpl::Client
@@ -230,6 +232,7 @@
void flushCurrentBuffer();
#endif
+#if !RELEASE_LOG_DISABLED
const Logger& logger() const final { return m_logger; }
const char* logClassName() const override { return "MediaPlayerPrivateGStreamer"; }
const void* logIdentifier() const final { return reinterpret_cast<const void*>(m_logIdentifier); }
@@ -237,6 +240,7 @@
const void* mediaPlayerLogIdentifier() { return logIdentifier(); }
const Logger& mediaPlayerLogger() { return logger(); }
+#endif
protected:
enum MainThreadNotification {
@@ -541,8 +545,10 @@
#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF)
GUniquePtr<struct wpe_video_plane_display_dmabuf_source> m_wpeVideoPlaneDisplayDmaBuf;
#endif
+#if !RELEASE_LOG_DISABLED
Ref<const Logger> m_logger;
const void* m_logIdentifier;
+#endif
};
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.h (258690 => 258691)
--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.h 2020-03-19 10:15:02 UTC (rev 258690)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.h 2020-03-19 10:26:23 UTC (rev 258691)
@@ -83,7 +83,9 @@
void blockDurationChanges();
void unblockDurationChanges();
+#if !RELEASE_LOG_DISABLED
WTFLogChannel& logChannel() const final { return WebCore::LogMediaSource; }
+#endif
private:
friend class MediaPlayerFactoryGStreamerMSE;
