Context Navigation

← Previous Changeset
Next Changeset →

Changeset 202806 in webkit

Timestamp:

Jul 4, 2016 3:51:54 AM (8 years ago)

Author:

Philippe Normand

Message:

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:

Location:

trunk/Source/WebCore

Files:

: 27 edited

ChangeLog (modified) (1 diff)
Modules/indexeddb/IDBDatabaseIdentifier.cpp (modified) (1 diff)
Modules/indexeddb/IDBDatabaseIdentifier.h (modified) (1 diff)
Modules/indexeddb/IDBKey.cpp (modified) (1 diff)
Modules/indexeddb/IDBKey.h (modified) (1 diff)
Modules/indexeddb/IDBKeyData.cpp (modified) (1 diff)
Modules/indexeddb/IDBKeyData.h (modified) (1 diff)
Modules/indexeddb/IDBKeyPath.cpp (modified) (1 diff)
Modules/indexeddb/IDBKeyRangeData.cpp (modified) (1 diff)
Modules/indexeddb/IDBKeyRangeData.h (modified) (1 diff)
Modules/indexeddb/server/IndexValueEntry.cpp (modified) (1 diff)
Modules/indexeddb/server/IndexValueStore.cpp (modified) (1 diff)
Modules/indexeddb/server/IndexValueStore.h (modified) (1 diff)
Modules/indexeddb/server/MemoryIDBBackingStore.cpp (modified) (1 diff)
Modules/indexeddb/server/UniqueIDBDatabase.cpp (modified) (1 diff)
Modules/indexeddb/shared/IDBDatabaseInfo.cpp (modified) (1 diff)
Modules/indexeddb/shared/IDBDatabaseInfo.h (modified) (1 diff)
Modules/indexeddb/shared/IDBIndexInfo.cpp (modified) (1 diff)
Modules/indexeddb/shared/IDBIndexInfo.h (modified) (1 diff)
Modules/indexeddb/shared/IDBObjectStoreInfo.cpp (modified) (1 diff)
Modules/indexeddb/shared/IDBObjectStoreInfo.h (modified) (1 diff)
Modules/indexeddb/shared/IDBResourceIdentifier.cpp (modified) (1 diff)
Modules/indexeddb/shared/IDBResourceIdentifier.h (modified) (1 diff)
Modules/indexeddb/shared/IDBTransactionInfo.cpp (modified) (1 diff)
Modules/indexeddb/shared/IDBTransactionInfo.h (modified) (1 diff)
page/SecurityOriginData.cpp (modified) (1 diff)
page/SecurityOriginData.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/Source/WebCore/ChangeLog

-                      r202803
+                      r202806
+-07-04  Philippe Normand  <pnormand@igalia.com>
+        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:
 -07-04  Commit Queue  <commit-queue@webkit.org>

trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp

r200163	r202806
74	74	}
75	75
76		#if~~ndef NDEBUG~~
	76	#if !LOG_DISABLED
77	77	String IDBDatabaseIdentifier::debugString() const
78	78	{

trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h

r201098	r202806
99	99	template<class Decoder> static bool decode(Decoder&, IDBDatabaseIdentifier&);
100	100
101		#if~~ndef NDEBUG~~
	101	#if !LOG_DISABLED
102	102	String debugString() const;
103	103	#endif

trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp

r201660	r202806
94	94	}
95	95
96		#if~~ndef NDEBUG~~
	96	#if !LOG_DISABLED
97	97	String IDBKey::loggingString() const
98	98	{

trunk/Source/WebCore/Modules/indexeddb/IDBKey.h

r201660	r202806
139	139	using RefCounted<IDBKey>::deref;
140	140
141		#if~~ndef NDEBUG~~
	141	#if !LOG_DISABLED
142	142	String loggingString() const;
143	143	#endif

trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp

r200372	r202806
258	258	}
259	259
260		#if~~ndef NDEBUG~~
	260	#if !LOG_DISABLED
261	261	String IDBKeyData::loggingString() const
262	262	{

trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h

r200372	r202806
87	87	template<class Decoder> static bool decode(Decoder&, IDBKeyData&);
88	88
89		#if~~ndef NDEBUG~~
	89	#if !LOG_DISABLED
90	90	WEBCORE_EXPORT String loggingString() const;
91	91	#endif

trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp

r200699	r202806
203	203	, m_array(array)
204	204	{
205		#if~~ndef NDEBUG~~
	205	#if !LOG_DISABLED
206	206	for (auto& key : array)
207	207	ASSERT(!key.isNull());

trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp

r199668	r202806
114	114	}
115	115
116		#if~~ndef NDEBUG~~
	116	#if !LOG_DISABLED
117	117	String IDBKeyRangeData::loggingString() const
118	118	{

trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.h

r197306	r202806
89	89	bool upperOpen;
90	90
91		#if~~ndef NDEBUG~~
	91	#if !LOG_DISABLED
92	92	String loggingString() const;
93	93	#endif

trunk/Source/WebCore/Modules/indexeddb/server/IndexValueEntry.cpp

r192847	r202806
128	128	bool IndexValueEntry::Iterator::isValid() const
129	129	{
130		#if~~ndef NDEBUG~~
	130	#if !LOG_DISABLED
131	131	if (m_entry) {
132	132	if (m_entry->m_unique)

trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.cpp

r194872	r202806
385	385	}
386	386
387		#if~~ndef NDEBUG~~
	387	#if !LOG_DISABLED
388	388	String IndexValueStore::loggingString() const
389	389	{

trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.h

r193657	r202806
99	99	Iterator reverseFind(const IDBKeyData&, const IDBKeyData& primaryKey, CursorDuplicity);
100	100
101		#if~~ndef NDEBUG~~
	101	#if !LOG_DISABLED
102	102	String loggingString() const;
103	103	#endif

trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp

r199668	r202806
179	179	ASSERT_UNUSED(transactionIdentifier, m_transactions.contains(transactionIdentifier));
180	180
181		#if~~ndef NDEBUG~~
	181	#if !LOG_DISABLED
182	182	auto transaction = m_transactions.get(transactionIdentifier);
183	183	ASSERT(transaction->isWriting());

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp

r201997	r202806
99	99	bool UniqueIDBDatabase::isVersionChangeInProgress()
100	100	{
101		#if~~ndef NDEBUG~~
	101	#if !LOG_DISABLED
102	102	if (m_versionChangeTransaction)
103	103	ASSERT(m_versionChangeDatabaseConnection);

trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp

r197405	r202806
145	145	}
146	146
147		#if~~ndef NDEBUG~~
	147	#if !LOG_DISABLED
148	148	String IDBDatabaseInfo::loggingString() const
149	149	{

trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h

r197405	r202806
68	68	template<class Decoder> static bool decode(Decoder&, IDBDatabaseInfo&);
69	69
70		#if~~ndef NDEBUG~~
	70	#if !LOG_DISABLED
71	71	String loggingString() const;
72	72	#endif

trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp

r192645	r202806
50	50	}
51	51
52		#if~~ndef NDEBUG~~
	52	#if !LOG_DISABLED
53	53	String IDBIndexInfo::loggingString(int indent) const
54	54	{

trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h

r197131	r202806
51	51	template<class Decoder> static bool decode(Decoder&, IDBIndexInfo&);
52	52
53		#if~~ndef NDEBUG~~
	53	#if !LOG_DISABLED
54	54	String loggingString(int indent = 0) const;
55	55	#endif

trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp

r197474	r202806
124	124	}
125	125
126		#if~~ndef NDEBUG~~
	126	#if !LOG_DISABLED
127	127	String IDBObjectStoreInfo::loggingString(int indent) const
128	128	{

trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h

r196771	r202806
66	66	template<class Decoder> static bool decode(Decoder&, IDBObjectStoreInfo&);
67	67
68		#if~~ndef NDEBUG~~
	68	#if !LOG_DISABLED
69	69	String loggingString(int indent = 0) const;
70	70	#endif

trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp

r200503	r202806
105	105	}
106	106
107		#if~~ndef NDEBUG~~
	107	#if !LOG_DISABLED
108	108	String IDBResourceIdentifier::loggingString() const
109	109	{

trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h

r200495	r202806
77	77	IDBResourceIdentifier isolatedCopy() const;
78	78
79		#if~~ndef NDEBUG~~
	79	#if !LOG_DISABLED
80	80	String loggingString() const;
81	81	#endif

trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp

r200495	r202806
95	95	}
96	96
97		#if~~ndef NDEBUG~~
	97	#if !LOG_DISABLED
98	98	String IDBTransactionInfo::loggingString() const
99	99	{

trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h

r200495	r202806
69	69	template<class Decoder> static bool decode(Decoder&, IDBTransactionInfo&);
70	70
71		#if~~ndef NDEBUG~~
	71	#if !LOG_DISABLED
72	72	String loggingString() const;
73	73	#endif

trunk/Source/WebCore/page/SecurityOriginData.cpp

r190291	r202806
47	47	}
48	48
49		#if~~ndef NDEBUG~~
	49	#if !LOG_DISABLED
50	50	String SecurityOriginData::debugString() const
51	51	{

trunk/Source/WebCore/page/SecurityOriginData.h

r194687	r202806
51	51	template<class Decoder> static bool decode(Decoder&, SecurityOriginData&);
52	52
53		#if~~ndef NDEBUG~~
	53	#if !LOG_DISABLED
54	54	String debugString() const;
55	55	#endif

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 202806 in webkit

Legend:

Download in other formats: