<!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>[191265] 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/191265">191265</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-18 16:29:15 -0700 (Sun, 18 Oct 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[EFL] Fix debug build break since <a href="http://trac.webkit.org/projects/webkit/changeset/191198">r191198</a>
https://bugs.webkit.org/show_bug.cgi?id=150277

Patch by Joonghun Park &lt;jh718.park@samsung.com&gt; on 2015-10-18
Reviewed by Darin Adler.

No new tests, no new behaviours.

Use the correct %&quot;PRIu64&quot; for uint64_t,
instead of %llu.

* Modules/indexeddb/client/IDBDatabaseImpl.cpp:
(WebCore::IDBClient::IDBDatabase::fireVersionChangeEvent):
* Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
(WebCore::IDBClient::IDBOpenDBRequest::onUpgradeNeeded):
* Modules/indexeddb/legacy/IDBDatabaseBackend.cpp:
(WebCore::IDBDatabaseBackend::processPendingOpenCalls):
(WebCore::IDBDatabaseBackend::openConnectionInternal):
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::notifyConnectionsOfVersionChange):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddblegacyIDBDatabaseBackendcpp">trunk/Source/WebCore/Modules/indexeddb/legacy/IDBDatabaseBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191264 => 191265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-10-18 23:27:37 UTC (rev 191264)
+++ trunk/Source/WebCore/ChangeLog        2015-10-18 23:29:15 UTC (rev 191265)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-10-18  Joonghun Park  &lt;jh718.park@samsung.com&gt;
+
+        [EFL] Fix debug build break since r191198
+        https://bugs.webkit.org/show_bug.cgi?id=150277
+
+        Reviewed by Darin Adler.
+
+        No new tests, no new behaviours.
+
+        Use the correct %&quot;PRIu64&quot; for uint64_t,
+        instead of %llu.
+
+        * Modules/indexeddb/client/IDBDatabaseImpl.cpp:
+        (WebCore::IDBClient::IDBDatabase::fireVersionChangeEvent):
+        * Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
+        (WebCore::IDBClient::IDBOpenDBRequest::onUpgradeNeeded):
+        * Modules/indexeddb/legacy/IDBDatabaseBackend.cpp:
+        (WebCore::IDBDatabaseBackend::processPendingOpenCalls):
+        (WebCore::IDBDatabaseBackend::openConnectionInternal):
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::notifyConnectionsOfVersionChange):
+
</ins><span class="cx"> 2015-10-18  Sungmann Cho  &lt;sungmann.cho@navercorp.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix the builds with ENABLE_INDEX_DATABASE=OFF.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp (191264 => 191265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp        2015-10-18 23:27:37 UTC (rev 191264)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp        2015-10-18 23:29:15 UTC (rev 191265)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> void IDBDatabase::fireVersionChangeEvent(uint64_t requestedVersion)
</span><span class="cx"> {
</span><span class="cx">     uint64_t currentVersion = m_info.version();
</span><del>-    LOG(IndexedDB, &quot;IDBDatabase::fireVersionChangeEvent - current version %llu, requested version %llu&quot;, currentVersion, requestedVersion);
</del><ins>+    LOG(IndexedDB, &quot;IDBDatabase::fireVersionChangeEvent - current version %&quot; PRIu64 &quot;, requested version %&quot; PRIu64, currentVersion, requestedVersion);
</ins><span class="cx"> 
</span><span class="cx">     if (!scriptExecutionContext())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp (191264 => 191265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp        2015-10-18 23:27:37 UTC (rev 191264)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp        2015-10-18 23:29:15 UTC (rev 191265)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">     uint64_t oldVersion = database-&gt;info().version();
</span><span class="cx">     uint64_t newVersion = transaction-&gt;info().newVersion();
</span><span class="cx"> 
</span><del>-    LOG(IndexedDB, &quot;IDBOpenDBRequest::onUpgradeNeeded() - current version is %llu, new is %llu&quot;, static_cast&lt;unsigned long long&gt;(oldVersion), static_cast&lt;unsigned long long&gt;(newVersion));
</del><ins>+    LOG(IndexedDB, &quot;IDBOpenDBRequest::onUpgradeNeeded() - current version is %&quot; PRIu64 &quot;, new is %&quot; PRIu64, oldVersion, newVersion);
</ins><span class="cx"> 
</span><span class="cx">     m_result = IDBAny::create(WTF::move(database));
</span><span class="cx">     m_readyState = IDBRequestReadyState::Done;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddblegacyIDBDatabaseBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/IDBDatabaseBackend.cpp (191264 => 191265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/legacy/IDBDatabaseBackend.cpp        2015-10-18 23:27:37 UTC (rev 191264)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/IDBDatabaseBackend.cpp        2015-10-18 23:29:15 UTC (rev 191265)
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx">             if (pendingOpenCall-&gt;version() == IDBDatabaseMetadata::NoIntVersion)
</span><span class="cx">                 message = &quot;Internal error opening database with no version specified.&quot;;
</span><span class="cx">             else
</span><del>-                message = String::format(&quot;Internal error opening database with version %llu&quot;, static_cast&lt;unsigned long long&gt;(pendingOpenCall-&gt;version()));
</del><ins>+                message = String::format(&quot;Internal error opening database with version %&quot; PRIu64, pendingOpenCall-&gt;version());
</ins><span class="cx">             pendingOpenCall-&gt;callbacks()-&gt;onError(IDBDatabaseError::create(IDBDatabaseException::UnknownError, message));
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (version &lt; m_metadata.version &amp;&amp; m_metadata.version != IDBDatabaseMetadata::NoIntVersion) {
</span><del>-        callbacks-&gt;onError(IDBDatabaseError::create(IDBDatabaseException::VersionError, String::format(&quot;The requested version (%llu) is less than the existing version (%llu).&quot;, static_cast&lt;unsigned long long&gt;(version), static_cast&lt;unsigned long long&gt;(m_metadata.version))));
</del><ins>+        callbacks-&gt;onError(IDBDatabaseError::create(IDBDatabaseException::VersionError, String::format(&quot;The requested version (%&quot; PRIu64 &quot;) is less than the existing version (%&quot; PRIu64 &quot;).&quot;, version, m_metadata.version)));
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (191264 => 191265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp        2015-10-18 23:27:37 UTC (rev 191264)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp        2015-10-18 23:29:15 UTC (rev 191265)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> 
</span><span class="cx">     uint64_t requestedVersion = m_versionChangeOperation-&gt;requestData().requestedVersion();
</span><span class="cx"> 
</span><del>-    LOG(IndexedDB, &quot;(main) UniqueIDBDatabase::notifyConnectionsOfVersionChange - %llu&quot;, static_cast&lt;unsigned long long&gt;(requestedVersion));
</del><ins>+    LOG(IndexedDB, &quot;(main) UniqueIDBDatabase::notifyConnectionsOfVersionChange - %&quot; PRIu64, requestedVersion);
</ins><span class="cx"> 
</span><span class="cx">     // 3.3.7 &quot;versionchange&quot; transaction steps
</span><span class="cx">     // Fire a versionchange event at each connection in m_openDatabaseConnections that is open.
</span></span></pre>
</div>
</div>

</body>
</html>