Diff
Modified: trunk/Source/WebCore/ChangeLog (274385 => 274386)
--- trunk/Source/WebCore/ChangeLog 2021-03-13 11:11:28 UTC (rev 274385)
+++ trunk/Source/WebCore/ChangeLog 2021-03-13 15:06:04 UTC (rev 274386)
@@ -1,3 +1,10 @@
+2021-03-13 Philippe Normand <[email protected]>
+
+ Unreviewed, fix build warnings after r273204 and r274323
+
+ * storage/StorageQuotaManager.cpp:
+ (WebCore::StorageQuotaManager::tryGrantRequest): Use portable uint64_t format specifier.
+
2021-03-13 Youenn Fablet <[email protected]>
Update RTCRtpScriptTransform to the latest version of the spec
Modified: trunk/Source/WebCore/storage/StorageQuotaManager.cpp (274385 => 274386)
--- trunk/Source/WebCore/storage/StorageQuotaManager.cpp 2021-03-13 11:11:28 UTC (rev 274385)
+++ trunk/Source/WebCore/storage/StorageQuotaManager.cpp 2021-03-13 15:06:04 UTC (rev 274386)
@@ -112,7 +112,7 @@
ASSERT(m_quotaCountDownLock.isLocked());
if (m_loggingEnabled)
- WTFLogAlways("%p - StorageQuotaManager tryGrantRequest m_quota %llu, m_usage %llu, m_quotaCountDown %llu, spaceRequested %llu", this, m_quota, m_usage, m_quotaCountDown, spaceRequested);
+ WTFLogAlways("%p - StorageQuotaManager tryGrantRequest m_quota %" PRIu64 ", m_usage %" PRIu64 ", m_quotaCountDown %" PRIu64 ", spaceRequested %" PRIu64, this, m_quota, m_usage, m_quotaCountDown, spaceRequested);
if (spaceRequested <= m_quotaCountDown) {
m_quotaCountDown -= spaceRequested;
Modified: trunk/Source/WebKit/ChangeLog (274385 => 274386)
--- trunk/Source/WebKit/ChangeLog 2021-03-13 11:11:28 UTC (rev 274385)
+++ trunk/Source/WebKit/ChangeLog 2021-03-13 15:06:04 UTC (rev 274386)
@@ -1,3 +1,14 @@
+2021-03-13 Philippe Normand <[email protected]>
+
+ Unreviewed, fix build warnings after r273204 and r274323
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::storageQuotaManager): Use portable uint64_t format specifier.
+ * Platform/IPC/StreamConnectionWorkQueue.cpp:
+ (IPC::StreamConnectionWorkQueue::StreamConnectionWorkQueue):
+ * Platform/IPC/StreamConnectionWorkQueue.h: Make m_name COCOA specific to avoid
+ unused-member on other platforms.
+
2021-03-13 Tim Horton <[email protected]>
Adopt DDMacAction instead of DDAction on macOS
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (274385 => 274386)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2021-03-13 11:11:28 UTC (rev 274385)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2021-03-13 15:06:04 UTC (rev 274386)
@@ -2533,7 +2533,7 @@
usage += IDBServer::IDBServer::diskUsage(idbRootPath, origin);
#endif
if (shouldPrintusageDetail == StorageQuotaManager::ShouldPrintUsageDetail::Yes)
- WTFLogAlways("StorageQuotaManager::UsageGetter Cachce usage %llu, IDB usage %llu", cacheUsage, usage);
+ WTFLogAlways("StorageQuotaManager::UsageGetter Cache usage %" PRIu64 ", IDB usage %" PRIu64, cacheUsage, usage);
return usage;
};
Modified: trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.cpp (274385 => 274386)
--- trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.cpp 2021-03-13 11:11:28 UTC (rev 274385)
+++ trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.cpp 2021-03-13 15:06:04 UTC (rev 274386)
@@ -29,7 +29,9 @@
namespace IPC {
StreamConnectionWorkQueue::StreamConnectionWorkQueue(const char* name)
+#if PLATFORM(COCOA)
: m_name(name)
+#endif
{
}
Modified: trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.h (274385 => 274386)
--- trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.h 2021-03-13 11:11:28 UTC (rev 274385)
+++ trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.h 2021-03-13 15:06:04 UTC (rev 274386)
@@ -53,7 +53,10 @@
void wakeUpProcessingThread();
void processStreams();
+#if PLATFORM(COCOA)
const char* const m_name;
+#endif
+
Semaphore m_wakeUpSemaphore;
RefPtr<Thread> m_processingThread;
