<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202806] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202806">202806</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-04 03:51:54 -0700 (Mon, 04 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseIdentifiercpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseIdentifierh">trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeycpp">trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyh">trunk/Source/WebCore/Modules/indexeddb/IDBKey.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatah">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyRangeDatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyRangeDatah">trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIndexValueEntrycpp">trunk/Source/WebCore/Modules/indexeddb/server/IndexValueEntry.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIndexValueStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIndexValueStoreh">trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBDatabaseInfocpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBDatabaseInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBIndexInfocpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBIndexInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBObjectStoreInfocpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBObjectStoreInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifiercpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifierh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfocpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginDatacpp">trunk/Source/WebCore/page/SecurityOriginData.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginDatah">trunk/Source/WebCore/page/SecurityOriginData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2016-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:
+
</ins><span class="cx"> 2016-07-04 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r202556.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseIdentifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return pathByAppendingComponent(mainFrameDirectory, openingOrigin.securityOrigin()->databaseIdentifier());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String IDBDatabaseIdentifier::debugString() const
</span><span class="cx"> {
</span><span class="cx"> return makeString(m_databaseName, "@", m_openingOrigin.debugString(), ":", m_mainFrameOrigin.debugString());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> template<class Encoder> void encode(Encoder&) const;
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, IDBDatabaseIdentifier&);
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String debugString() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> return !compare(other);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String IDBKey::loggingString() const
</span><span class="cx"> {
</span><span class="cx"> return IDBKeyData(this).loggingString();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKey.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> using RefCounted<IDBKey>::ref;
</span><span class="cx"> using RefCounted<IDBKey>::deref;
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String loggingString() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String IDBKeyData::loggingString() const
</span><span class="cx"> {
</span><span class="cx"> if (m_isNull)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> template<class Encoder> void encode(Encoder&) const;
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, IDBKeyData&);
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> WEBCORE_EXPORT String loggingString() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> : m_type(Type::Array)
</span><span class="cx"> , m_array(array)
</span><span class="cx"> {
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> for (auto& key : array)
</span><span class="cx"> ASSERT(!key.isNull());
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyRangeDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String IDBKeyRangeData::loggingString() const
</span><span class="cx"> {
</span><span class="cx"> auto result = makeString(lowerOpen ? "( " : "[ ", lowerKey.loggingString(), ", ", upperKey.loggingString(), upperOpen ? " )" : " ]");
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyRangeDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyRangeData.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> bool lowerOpen;
</span><span class="cx"> bool upperOpen;
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String loggingString() const;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIndexValueEntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IndexValueEntry.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> bool IndexValueEntry::Iterator::isValid() const
</span><span class="cx"> {
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> if (m_entry) {
</span><span class="cx"> if (m_entry->m_unique)
</span><span class="cx"> ASSERT(m_entry->m_key);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIndexValueStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> return m_primaryKeyIterator.key();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String IndexValueStore::loggingString() const
</span><span class="cx"> {
</span><span class="cx"> String result;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIndexValueStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> Iterator find(const IDBKeyData&, const IDBKeyData& primaryKey);
</span><span class="cx"> Iterator reverseFind(const IDBKeyData&, const IDBKeyData& primaryKey, CursorDuplicity);
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String loggingString() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT_UNUSED(transactionIdentifier, m_transactions.contains(transactionIdentifier));
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> auto transaction = m_transactions.get(transactionIdentifier);
</span><span class="cx"> ASSERT(transaction->isWriting());
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabase::isVersionChangeInProgress()
</span><span class="cx"> {
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> if (m_versionChangeTransaction)
</span><span class="cx"> ASSERT(m_versionChangeDatabaseConnection);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBDatabaseInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> m_objectStoreMap.remove(objectStoreIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String IDBDatabaseInfo::loggingString() const
</span><span class="cx"> {
</span><span class="cx"> String top = makeString("Database: ", m_name, " version ", String::number(m_version), "\n");
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBDatabaseInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> template<class Encoder> void encode(Encoder&) const;
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, IDBDatabaseInfo&);
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String loggingString() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBIndexInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> return { m_identifier, m_objectStoreIdentifier, m_name.isolatedCopy(), m_keyPath.isolatedCopy(), m_unique, m_multiEntry };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String IDBIndexInfo::loggingString(int indent) const
</span><span class="cx"> {
</span><span class="cx"> String indentString;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBIndexInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> template<class Encoder> void encode(Encoder&) const;
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, IDBIndexInfo&);
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String loggingString(int indent = 0) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBObjectStoreInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> m_indexMap.remove(indexIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String IDBObjectStoreInfo::loggingString(int indent) const
</span><span class="cx"> {
</span><span class="cx"> String indentString;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBObjectStoreInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> template<class Encoder> void encode(Encoder&) const;
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, IDBObjectStoreInfo&);
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String loggingString(int indent = 0) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> && m_resourceNumber == std::numeric_limits<uint64_t>::max();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String IDBResourceIdentifier::loggingString() const
</span><span class="cx"> {
</span><span class="cx"> return String::format("<%" PRIu64", %" PRIu64">", m_idbConnectionIdentifier, m_resourceNumber);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResourceIdentifier isolatedCopy() const;
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String loggingString() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> destination.m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(*source.m_originalDatabaseInfo, IDBDatabaseInfo::IsolatedCopy);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String IDBTransactionInfo::loggingString() const
</span><span class="cx"> {
</span><span class="cx"> String modeString;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> template<class Encoder> void encode(Encoder&) const;
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, IDBTransactionInfo&);
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String loggingString() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOriginData.cpp (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> return securityOriginData;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String SecurityOriginData::debugString() const
</span><span class="cx"> {
</span><span class="cx"> return makeString(protocol, "://", host, ":", String::number(port));
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOriginData.h (202805 => 202806)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> template<class Encoder> void encode(Encoder&) const;
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, SecurityOriginData&);
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String debugString() const;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>