Diff
Modified: trunk/Source/WebCore/ChangeLog (202805 => 202806)
--- trunk/Source/WebCore/ChangeLog 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/ChangeLog 2016-07-04 10:51:54 UTC (rev 202806)
@@ -1,3 +1,43 @@
+2016-07-04 Philippe Normand <[email protected]>
+
+ Release build with logging enabled fails
+ https://bugs.webkit.org/show_bug.cgi?id=159403
+
+ Reviewed by Žan Doberšek.
+
+ Protect logging-related methods with !LOG_DISABLED.
+
+ * Modules/indexeddb/IDBDatabaseIdentifier.cpp:
+ * Modules/indexeddb/IDBDatabaseIdentifier.h:
+ * Modules/indexeddb/IDBKey.cpp:
+ * Modules/indexeddb/IDBKey.h:
+ * Modules/indexeddb/IDBKeyData.cpp:
+ * Modules/indexeddb/IDBKeyData.h:
+ * Modules/indexeddb/IDBKeyPath.cpp:
+ (WebCore::IDBKeyPath::IDBKeyPath):
+ * Modules/indexeddb/IDBKeyRangeData.cpp:
+ * Modules/indexeddb/IDBKeyRangeData.h:
+ * Modules/indexeddb/server/IndexValueEntry.cpp:
+ (WebCore::IDBServer::IndexValueEntry::Iterator::isValid):
+ * Modules/indexeddb/server/IndexValueStore.cpp:
+ * Modules/indexeddb/server/IndexValueStore.h:
+ * Modules/indexeddb/server/MemoryIDBBackingStore.cpp:
+ (WebCore::IDBServer::MemoryIDBBackingStore::clearObjectStore):
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::isVersionChangeInProgress):
+ * Modules/indexeddb/shared/IDBDatabaseInfo.cpp:
+ * Modules/indexeddb/shared/IDBDatabaseInfo.h:
+ * Modules/indexeddb/shared/IDBIndexInfo.cpp:
+ * Modules/indexeddb/shared/IDBIndexInfo.h:
+ * Modules/indexeddb/shared/IDBObjectStoreInfo.cpp:
+ * Modules/indexeddb/shared/IDBObjectStoreInfo.h:
+ * Modules/indexeddb/shared/IDBResourceIdentifier.cpp:
+ * Modules/indexeddb/shared/IDBResourceIdentifier.h:
+ * Modules/indexeddb/shared/IDBTransactionInfo.cpp:
+ * Modules/indexeddb/shared/IDBTransactionInfo.h:
+ * page/SecurityOriginData.cpp:
+ * page/SecurityOriginData.h:
+
2016-07-04 Commit Queue <[email protected]>
Unreviewed, rolling out r202556.
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -73,7 +73,7 @@
return pathByAppendingComponent(mainFrameDirectory, openingOrigin.securityOrigin()->databaseIdentifier());
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String IDBDatabaseIdentifier::debugString() const
{
return makeString(m_databaseName, "@", m_openingOrigin.debugString(), ":", m_mainFrameOrigin.debugString());
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -98,7 +98,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static bool decode(Decoder&, IDBDatabaseIdentifier&);
-#ifndef NDEBUG
+#if !LOG_DISABLED
String debugString() const;
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -93,7 +93,7 @@
return !compare(other);
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String IDBKey::loggingString() const
{
return IDBKeyData(this).loggingString();
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKey.h (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/IDBKey.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKey.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -138,7 +138,7 @@
using RefCounted<IDBKey>::ref;
using RefCounted<IDBKey>::deref;
-#ifndef NDEBUG
+#if !LOG_DISABLED
String loggingString() const;
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -257,7 +257,7 @@
return 0;
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String IDBKeyData::loggingString() const
{
if (m_isNull)
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -86,7 +86,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static bool decode(Decoder&, IDBKeyData&);
-#ifndef NDEBUG
+#if !LOG_DISABLED
WEBCORE_EXPORT String loggingString() const;
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -202,7 +202,7 @@
: m_type(Type::Array)
, m_array(array)
{
-#ifndef NDEBUG
+#if !LOG_DISABLED
for (auto& key : array)
ASSERT(!key.isNull());
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -113,7 +113,7 @@
return true;
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String IDBKeyRangeData::loggingString() const
{
auto result = makeString(lowerOpen ? "( " : "[ ", lowerKey.loggingString(), ", ", upperKey.loggingString(), upperOpen ? " )" : " ]");
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.h (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -88,7 +88,7 @@
bool lowerOpen;
bool upperOpen;
-#ifndef NDEBUG
+#if !LOG_DISABLED
String loggingString() const;
#endif
};
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IndexValueEntry.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/server/IndexValueEntry.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IndexValueEntry.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -127,7 +127,7 @@
bool IndexValueEntry::Iterator::isValid() const
{
-#ifndef NDEBUG
+#if !LOG_DISABLED
if (m_entry) {
if (m_entry->m_unique)
ASSERT(m_entry->m_key);
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -384,7 +384,7 @@
return m_primaryKeyIterator.key();
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String IndexValueStore::loggingString() const
{
String result;
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.h (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -98,7 +98,7 @@
Iterator find(const IDBKeyData&, const IDBKeyData& primaryKey);
Iterator reverseFind(const IDBKeyData&, const IDBKeyData& primaryKey, CursorDuplicity);
-#ifndef NDEBUG
+#if !LOG_DISABLED
String loggingString() const;
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -178,7 +178,7 @@
ASSERT_UNUSED(transactionIdentifier, m_transactions.contains(transactionIdentifier));
-#ifndef NDEBUG
+#if !LOG_DISABLED
auto transaction = m_transactions.get(transactionIdentifier);
ASSERT(transaction->isWriting());
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -98,7 +98,7 @@
bool UniqueIDBDatabase::isVersionChangeInProgress()
{
-#ifndef NDEBUG
+#if !LOG_DISABLED
if (m_versionChangeTransaction)
ASSERT(m_versionChangeDatabaseConnection);
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -144,7 +144,7 @@
m_objectStoreMap.remove(objectStoreIdentifier);
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String IDBDatabaseInfo::loggingString() const
{
String top = makeString("Database: ", m_name, " version ", String::number(m_version), "\n");
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -67,7 +67,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static bool decode(Decoder&, IDBDatabaseInfo&);
-#ifndef NDEBUG
+#if !LOG_DISABLED
String loggingString() const;
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -49,7 +49,7 @@
return { m_identifier, m_objectStoreIdentifier, m_name.isolatedCopy(), m_keyPath.isolatedCopy(), m_unique, m_multiEntry };
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String IDBIndexInfo::loggingString(int indent) const
{
String indentString;
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -50,7 +50,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static bool decode(Decoder&, IDBIndexInfo&);
-#ifndef NDEBUG
+#if !LOG_DISABLED
String loggingString(int indent = 0) const;
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -123,7 +123,7 @@
m_indexMap.remove(indexIdentifier);
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String IDBObjectStoreInfo::loggingString(int indent) const
{
String indentString;
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -65,7 +65,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static bool decode(Decoder&, IDBObjectStoreInfo&);
-#ifndef NDEBUG
+#if !LOG_DISABLED
String loggingString(int indent = 0) const;
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -104,7 +104,7 @@
&& m_resourceNumber == std::numeric_limits<uint64_t>::max();
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String IDBResourceIdentifier::loggingString() const
{
return String::format("<%" PRIu64", %" PRIu64">", m_idbConnectionIdentifier, m_resourceNumber);
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -76,7 +76,7 @@
IDBResourceIdentifier isolatedCopy() const;
-#ifndef NDEBUG
+#if !LOG_DISABLED
String loggingString() const;
#endif
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -94,7 +94,7 @@
destination.m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(*source.m_originalDatabaseInfo, IDBDatabaseInfo::IsolatedCopy);
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String IDBTransactionInfo::loggingString() const
{
String modeString;
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h (202805 => 202806)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -68,7 +68,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static bool decode(Decoder&, IDBTransactionInfo&);
-#ifndef NDEBUG
+#if !LOG_DISABLED
String loggingString() const;
#endif
Modified: trunk/Source/WebCore/page/SecurityOriginData.cpp (202805 => 202806)
--- trunk/Source/WebCore/page/SecurityOriginData.cpp 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/page/SecurityOriginData.cpp 2016-07-04 10:51:54 UTC (rev 202806)
@@ -46,7 +46,7 @@
return securityOriginData;
}
-#ifndef NDEBUG
+#if !LOG_DISABLED
String SecurityOriginData::debugString() const
{
return makeString(protocol, "://", host, ":", String::number(port));
Modified: trunk/Source/WebCore/page/SecurityOriginData.h (202805 => 202806)
--- trunk/Source/WebCore/page/SecurityOriginData.h 2016-07-04 09:29:45 UTC (rev 202805)
+++ trunk/Source/WebCore/page/SecurityOriginData.h 2016-07-04 10:51:54 UTC (rev 202806)
@@ -50,7 +50,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static bool decode(Decoder&, SecurityOriginData&);
-#ifndef NDEBUG
+#if !LOG_DISABLED
String debugString() const;
#endif
};
