<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[28537] trunk/WebCore</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/28537">28537</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2007-12-07 15:00:01 -0800 (Fri, 07 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Anders

        Fix &lt;rdar://problem/5636115&gt; - Prompted for quota increase to create database when it already existed

        * storage/DatabaseTracker.cpp:
        (WebCore::DatabaseTracker::canEstablishDatabase): Check hasEntryForDatabase before doing any prompting
        (WebCore::DatabaseTracker::hasEntryForDatabase): Check and see if this database already exists
        * storage/DatabaseTracker.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorestorageDatabaseTrackercpp">trunk/WebCore/storage/DatabaseTracker.cpp</a></li>
<li><a href="#trunkWebCorestorageDatabaseTrackerh">trunk/WebCore/storage/DatabaseTracker.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (28536 => 28537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2007-12-07 22:58:09 UTC (rev 28536)
+++ trunk/WebCore/ChangeLog        2007-12-07 23:00:01 UTC (rev 28537)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2007-12-07  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Reviewed by Anders
+
+        Fix &lt;rdar://problem/5636115&gt; - Prompted for quota increase to create database when it already existed
+
+        * storage/DatabaseTracker.cpp:
+        (WebCore::DatabaseTracker::canEstablishDatabase): Check hasEntryForDatabase before doing any prompting
+        (WebCore::DatabaseTracker::hasEntryForDatabase): Check and see if this database already exists
+        * storage/DatabaseTracker.h:
+
</ins><span class="cx"> 2007-12-07  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Mitz.
</span></span></pre></div>
<a id="trunkWebCorestorageDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/storage/DatabaseTracker.cpp (28536 => 28537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/storage/DatabaseTracker.cpp        2007-12-07 22:58:09 UTC (rev 28536)
+++ trunk/WebCore/storage/DatabaseTracker.cpp        2007-12-07 23:00:01 UTC (rev 28537)
</span><span class="lines">@@ -131,6 +131,10 @@
</span><span class="cx">     if (!hasEntryForOrigin(originData))
</span><span class="cx">         establishEntryForOrigin(originData);
</span><span class="cx">     
</span><ins>+    // If a database already exists, you can always establish a handle to it
+    if (hasEntryForDatabase(originData, name))
+        return true;
+        
</ins><span class="cx">     // If the new database will fit as-is, allow its creation
</span><span class="cx">     unsigned long long usage = usageForOrigin(originData);
</span><span class="cx">     if (usage + estimatedSize &lt; quotaForOrigin(originData))
</span><span class="lines">@@ -153,6 +157,19 @@
</span><span class="cx">     return m_originQuotaMap-&gt;contains(origin);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool DatabaseTracker::hasEntryForDatabase(const SecurityOriginData&amp; origin, const String&amp; databaseIdentifier)
+{
+    SQLiteStatement statement(m_database, &quot;SELECT guid FROM Databases WHERE origin=? AND name=?;&quot;);
+
+    if (statement.prepare() != SQLResultOk)
+        return false;
+
+    statement.bindText(1, origin.stringIdentifier());
+    statement.bindText(2, databaseIdentifier);
+
+    return statement.step() == SQLResultRow;
+}
+
</ins><span class="cx"> void DatabaseTracker::establishEntryForOrigin(const SecurityOriginData&amp; origin)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!hasEntryForOrigin(origin));
</span></span></pre></div>
<a id="trunkWebCorestorageDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/storage/DatabaseTracker.h (28536 => 28537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/storage/DatabaseTracker.h        2007-12-07 22:58:09 UTC (rev 28536)
+++ trunk/WebCore/storage/DatabaseTracker.h        2007-12-07 23:00:01 UTC (rev 28537)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx">     void openTrackerDatabase();
</span><span class="cx">     
</span><span class="cx">     bool hasEntryForOrigin(const SecurityOriginData&amp;);
</span><ins>+    bool hasEntryForDatabase(const SecurityOriginData&amp;, const String&amp; databaseIdentifier);
</ins><span class="cx">     void establishEntryForOrigin(const SecurityOriginData&amp;);
</span><span class="cx">     
</span><span class="cx">     bool addDatabase(const SecurityOriginData&amp; origin, const String&amp; name, const String&amp; path);
</span></span></pre>
</div>
</div>

</body>
</html>