Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (241526 => 241527)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-02-14 11:27:20 UTC (rev 241526)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-02-14 11:27:24 UTC (rev 241527)
@@ -1,3 +1,14 @@
+2019-02-13 Michael Catanzaro <[email protected]>
+
+ Unreviewed, fix unused variable warnings after r241148/r241251
+ https://bugs.webkit.org/show_bug.cgi?id=194348
+ <rdar://problem/47566449>
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveRenderingError):
+ (WebCore::SourceBuffer::evictCodedFrames):
+ (WebCore::SourceBuffer::provideMediaData):
+
2019-02-13 Sihui Liu <[email protected]>
REGRESSION: [ Mac Debug WK2 ] Layout Test storage/indexeddb/key-type-infinity-private.html is a flaky crash
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (241526 => 241527)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2019-02-14 11:27:20 UTC (rev 241526)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2019-02-14 11:27:24 UTC (rev 241527)
@@ -718,7 +718,7 @@
void SourceBuffer::sourceBufferPrivateDidReceiveRenderingError(int error)
{
-#if LOG_DISABLED
+#if RELEASE_LOG_DISABLED
UNUSED_PARAM(error);
#endif
@@ -956,7 +956,7 @@
MediaTime currentTime = m_source->currentTime();
MediaTime maximumRangeEnd = currentTime - thirtySeconds;
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
DEBUG_LOG(LOGIDENTIFIER, "currentTime = ", m_source->currentTime(), ", require ", extraMemoryCost() + newDataSize, " bytes, maximum buffer size is ", maximumBufferSize);
size_t initialBufferedSize = extraMemoryCost();
#endif
@@ -976,7 +976,7 @@
rangeEnd += thirtySeconds;
}
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
if (!m_bufferFull) {
DEBUG_LOG(LOGIDENTIFIER, "evicted ", initialBufferedSize - extraMemoryCost());
return;
@@ -989,7 +989,7 @@
auto buffered = m_buffered->ranges();
size_t currentTimeRange = buffered.find(currentTime);
if (currentTimeRange == notFound || currentTimeRange == buffered.length() - 1) {
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
ERROR_LOG(LOGIDENTIFIER, "evicted ", initialBufferedSize - extraMemoryCost(), " bytes but FAILED to free enough");
#endif
return;
@@ -1023,7 +1023,7 @@
rangeEnd -= thirtySeconds;
}
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
if (m_bufferFull)
ERROR_LOG(LOGIDENTIFIER, "evicted ", initialBufferedSize - extraMemoryCost(), " but FAILED to free enough");
else
@@ -2002,7 +2002,7 @@
if (m_source->isSeeking())
return;
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
unsigned enqueuedSamples = 0;
#endif
@@ -2037,12 +2037,12 @@
trackBuffer.lastEnqueuedDecodeKey = {sample->decodeTime(), sample->presentationTime()};
trackBuffer.lastEnqueuedDecodeDuration = sample->duration();
m_private->enqueueSample(sample.releaseNonNull(), trackID);
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
++enqueuedSamples;
#endif
}
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
DEBUG_LOG(LOGIDENTIFIER, "Enqueued ", enqueuedSamples, " samples, ", static_cast<size_t>(trackBuffer.decodeQueue.size()), " remaining");
#endif
