<!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>[150301] trunk/Source/WebKit2</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/150301">150301</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-05-17 14:51:30 -0700 (Fri, 17 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Only import local storage items from the database once
https://bugs.webkit.org/show_bug.cgi?id=116354

Reviewed by Andreas Kling.

We import items from the database over and over, when we only want to do it once. Use a
boolean flag to guard against doing it more than once.

Also, rename importItemsFromDatabase to openDatabaseAndImportItemsIfNeeded since it now
also opens the database (even if it doesn't need to import anything). This is preparation for an
upcoming patch where the database will be closed when it's cleared.

* UIProcess/Storage/StorageManager.cpp:
(StorageManager::StorageArea):
(WebKit::StorageManager::StorageArea::StorageArea):
(WebKit::StorageManager::StorageArea::setItem):
(WebKit::StorageManager::StorageArea::removeItem):
(WebKit::StorageManager::StorageArea::clear):
(WebKit::StorageManager::StorageArea::items):
(WebKit::StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (150300 => 150301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-05-17 21:41:18 UTC (rev 150300)
+++ trunk/Source/WebKit2/ChangeLog        2013-05-17 21:51:30 UTC (rev 150301)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2013-05-17  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Only import local storage items from the database once
+        https://bugs.webkit.org/show_bug.cgi?id=116354
+
+        Reviewed by Andreas Kling.
+
+        We import items from the database over and over, when we only want to do it once. Use a 
+        boolean flag to guard against doing it more than once. 
+        
+        Also, rename importItemsFromDatabase to openDatabaseAndImportItemsIfNeeded since it now
+        also opens the database (even if it doesn't need to import anything). This is preparation for an
+        upcoming patch where the database will be closed when it's cleared.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (StorageManager::StorageArea):
+        (WebKit::StorageManager::StorageArea::StorageArea):
+        (WebKit::StorageManager::StorageArea::setItem):
+        (WebKit::StorageManager::StorageArea::removeItem):
+        (WebKit::StorageManager::StorageArea::clear):
+        (WebKit::StorageManager::StorageArea::items):
+        (WebKit::StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded):
+
</ins><span class="cx"> 2013-05-17  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;rdar://problem/13869765&gt; Lion: Crashes in islcCanLoadInputMethodFromBundleID.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (150300 => 150301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp        2013-05-17 21:41:18 UTC (rev 150300)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp        2013-05-17 21:51:30 UTC (rev 150301)
</span><span class="lines">@@ -62,13 +62,14 @@
</span><span class="cx"> private:
</span><span class="cx">     explicit StorageArea(LocalStorageNamespace*, PassRefPtr&lt;SecurityOrigin&gt;, unsigned quotaInBytes);
</span><span class="cx"> 
</span><del>-    void importItemsFromDatabase();
</del><ins>+    void openDatabaseAndImportItemsIfNeeded();
</ins><span class="cx"> 
</span><span class="cx">     void dispatchEvents(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String&amp; key, const String&amp; oldValue, const String&amp; newValue, const String&amp; urlString) const;
</span><span class="cx"> 
</span><span class="cx">     // Will be null if the storage area belongs to a session storage namespace.
</span><span class="cx">     LocalStorageNamespace* m_localStorageNamespace;
</span><span class="cx">     RefPtr&lt;LocalStorageDatabase&gt; m_localStorageDatabase;
</span><ins>+    bool m_didImportItemsFromDatabase;
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;SecurityOrigin&gt; m_securityOrigin;
</span><span class="cx">     unsigned m_quotaInBytes;
</span><span class="lines">@@ -105,12 +106,11 @@
</span><span class="cx"> 
</span><span class="cx"> StorageManager::StorageArea::StorageArea(LocalStorageNamespace* localStorageNamespace, PassRefPtr&lt;SecurityOrigin&gt; securityOrigin, unsigned quotaInBytes)
</span><span class="cx">     : m_localStorageNamespace(localStorageNamespace)
</span><ins>+    , m_didImportItemsFromDatabase(false)
</ins><span class="cx">     , m_securityOrigin(securityOrigin)
</span><span class="cx">     , m_quotaInBytes(quotaInBytes)
</span><span class="cx">     , m_storageMap(StorageMap::create(m_quotaInBytes))
</span><span class="cx"> {
</span><del>-    if (m_localStorageNamespace)
-        m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace-&gt;storageManager()-&gt;m_queue, m_localStorageNamespace-&gt;storageManager()-&gt;m_localStorageDatabaseTracker, m_securityOrigin.get());
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> StorageManager::StorageArea::~StorageArea()
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> 
</span><span class="cx"> void StorageManager::StorageArea::setItem(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String&amp; key, const String&amp; value, const String&amp; urlString, bool&amp; quotaException)
</span><span class="cx"> {
</span><del>-    importItemsFromDatabase();
</del><ins>+    openDatabaseAndImportItemsIfNeeded();
</ins><span class="cx"> 
</span><span class="cx">     String oldValue;
</span><span class="cx"> 
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> 
</span><span class="cx"> void StorageManager::StorageArea::removeItem(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String&amp; key, const String&amp; urlString)
</span><span class="cx"> {
</span><del>-    importItemsFromDatabase();
</del><ins>+    openDatabaseAndImportItemsIfNeeded();
</ins><span class="cx"> 
</span><span class="cx">     String oldValue;
</span><span class="cx">     RefPtr&lt;StorageMap&gt; newStorageMap = m_storageMap-&gt;removeItem(key, oldValue);
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> 
</span><span class="cx"> void StorageManager::StorageArea::clear(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String&amp; urlString)
</span><span class="cx"> {
</span><del>-    importItemsFromDatabase();
</del><ins>+    openDatabaseAndImportItemsIfNeeded();
</ins><span class="cx"> 
</span><span class="cx">     if (!m_storageMap-&gt;length())
</span><span class="cx">         return;
</span><span class="lines">@@ -200,17 +200,25 @@
</span><span class="cx"> 
</span><span class="cx"> const HashMap&lt;String, String&gt;&amp; StorageManager::StorageArea::items()
</span><span class="cx"> {
</span><del>-    importItemsFromDatabase();
</del><ins>+    openDatabaseAndImportItemsIfNeeded();
</ins><span class="cx"> 
</span><span class="cx">     return m_storageMap-&gt;items();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void StorageManager::StorageArea::importItemsFromDatabase()
</del><ins>+void StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded()
</ins><span class="cx"> {
</span><ins>+    if (!m_localStorageNamespace)
+        return;
+
+    // We open the database here even if we've already imported our items to ensure that the database is open if we need to write to it.
</ins><span class="cx">     if (!m_localStorageDatabase)
</span><ins>+        m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace-&gt;storageManager()-&gt;m_queue, m_localStorageNamespace-&gt;storageManager()-&gt;m_localStorageDatabaseTracker, m_securityOrigin.get());
+
+    if (m_didImportItemsFromDatabase)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     m_localStorageDatabase-&gt;importItems(*m_storageMap);
</span><ins>+    m_didImportItemsFromDatabase = true;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void StorageManager::StorageArea::dispatchEvents(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String&amp; key, const String&amp; oldValue, const String&amp; newValue, const String&amp; urlString) const
</span></span></pre>
</div>
</div>

</body>
</html>