<!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>[149460] trunk/Source</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/149460">149460</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-05-01 16:17:29 -0700 (Wed, 01 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Implement LocalStorageDatabase::importItems
https://bugs.webkit.org/show_bug.cgi?id=115493

Reviewed by Andreas Kling.

Source/WebCore:

Export symbols needed by WebKit2.

* WebCore.exp.in:

Source/WebKit2:

Fetch items and insert them in the storage map.
* UIProcess/Storage/LocalStorageDatabase.cpp:
(WebKit::LocalStorageDatabase::importItems):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabasecpp">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149459 => 149460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-01 23:01:39 UTC (rev 149459)
+++ trunk/Source/WebCore/ChangeLog        2013-05-01 23:17:29 UTC (rev 149460)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2013-05-01  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Implement LocalStorageDatabase::importItems
+        https://bugs.webkit.org/show_bug.cgi?id=115493
+
+        Reviewed by Andreas Kling.
+
+        Export symbols needed by WebKit2.
+
+        * WebCore.exp.in:
+
+2013-05-01  Anders Carlsson  &lt;andersca@apple.com&gt;
+
</ins><span class="cx">         Begin work on loading items from the local storage database
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=115489
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (149459 => 149460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2013-05-01 23:01:39 UTC (rev 149459)
+++ trunk/Source/WebCore/WebCore.exp.in        2013-05-01 23:17:29 UTC (rev 149460)
</span><span class="lines">@@ -272,6 +272,7 @@
</span><span class="cx"> __ZN7WebCore13pointerCursorEv
</span><span class="cx"> __ZN7WebCore13ResourceErrorC1EP7NSError
</span><span class="cx"> __ZN7WebCore13ResourceErrorC1EP9__CFError
</span><ins>+__ZN7WebCore13SQLResultDoneE
</ins><span class="cx"> __ZN7WebCore13StyledElement22setInlineStylePropertyENS_13CSSPropertyIDERKN3WTF6StringEb
</span><span class="cx"> __ZN7WebCore13StyledElement22setInlineStylePropertyENS_13CSSPropertyIDEdNS_17CSSPrimitiveValue9UnitTypesEb
</span><span class="cx"> __ZN7WebCore13cookiesForDOMERKNS_21NetworkStorageSessionERKNS_4KURLES5_
</span><span class="lines">@@ -474,7 +475,11 @@
</span><span class="cx"> __ZN7WebCore15ProtectionSpaceC1Ev
</span><span class="cx"> __ZN7WebCore15ResourceRequest21httpPipeliningEnabledEv
</span><span class="cx"> __ZN7WebCore15ResourceRequest24setHTTPPipeliningEnabledEb
</span><ins>+__ZN7WebCore15SQLiteStatement13getColumnTextEi
+__ZN7WebCore15SQLiteStatement21getColumnBlobAsStringEi
</ins><span class="cx"> __ZN7WebCore15SQLiteStatement22isColumnDeclaredAsBlobEi
</span><ins>+__ZN7WebCore15SQLiteStatement4stepEv
+__ZN7WebCore15SQLiteStatement7prepareEv
</ins><span class="cx"> __ZN7WebCore15SQLiteStatementC1ERNS_14SQLiteDatabaseERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore15SQLiteStatementD1Ev
</span><span class="cx"> __ZN7WebCore15ScrollAlignment17alignCenterAlwaysE
</span><span class="lines">@@ -1792,6 +1797,7 @@
</span><span class="cx"> __ZN7WebCore10FloatPointC1ERK8_NSPoint
</span><span class="cx"> __ZN7WebCore10handCursorEv
</span><span class="cx"> __ZN7WebCore11CachedImage5imageEv
</span><ins>+__ZN7WebCore11SQLResultOkE
</ins><span class="cx"> __ZN7WebCore11globalPointERK8_NSPointP8NSWindow
</span><span class="cx"> __ZN7WebCore11toUserSpaceERK7_NSRectP8NSWindow
</span><span class="cx"> __ZN7WebCore12EventHandler10mouseMovedEP7NSEvent
</span><span class="lines">@@ -1803,6 +1809,7 @@
</span><span class="cx"> __ZN7WebCore12EventHandler8keyEventEP7NSEvent
</span><span class="cx"> __ZN7WebCore12EventHandler9mouseDownEP7NSEvent
</span><span class="cx"> __ZN7WebCore12PopupMenuMacC1EPNS_15PopupMenuClientE
</span><ins>+__ZN7WebCore12SQLResultRowE
</ins><span class="cx"> __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
</span><span class="cx"> __ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_4KURLES5_RN3WTF6VectorINS_6CookieELm0ENS6_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore15GraphicsContextC1EP9CGContext
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (149459 => 149460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-05-01 23:01:39 UTC (rev 149459)
+++ trunk/Source/WebKit2/ChangeLog        2013-05-01 23:17:29 UTC (rev 149460)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2013-05-01  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Implement LocalStorageDatabase::importItems
+        https://bugs.webkit.org/show_bug.cgi?id=115493
+
+        Reviewed by Andreas Kling.
+
+        Fetch items and insert them in the storage map.
+        * UIProcess/Storage/LocalStorageDatabase.cpp:
+        (WebKit::LocalStorageDatabase::importItems):
+
+2013-05-01  Anders Carlsson  &lt;andersca@apple.com&gt;
+
</ins><span class="cx">         Begin work on loading items from the local storage database
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=115489
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp (149459 => 149460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp        2013-05-01 23:01:39 UTC (rev 149459)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp        2013-05-01 23:17:29 UTC (rev 149460)
</span><span class="lines">@@ -30,7 +30,9 @@
</span><span class="cx"> #include &lt;WebCore/FileSystem.h&gt;
</span><span class="cx"> #include &lt;WebCore/SQLiteStatement.h&gt;
</span><span class="cx"> #include &lt;WebCore/SQLiteTransaction.h&gt;
</span><ins>+#include &lt;WebCore/StorageMap.h&gt;
</ins><span class="cx"> #include &lt;wtf/PassRefPtr.h&gt;
</span><ins>+#include &lt;wtf/text/StringHash.h&gt;
</ins><span class="cx"> #include &lt;wtf/text/WTFString.h&gt;
</span><span class="cx"> 
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -134,7 +136,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void LocalStorageDatabase::importItems(StorageMap&amp;)
</del><ins>+void LocalStorageDatabase::importItems(StorageMap&amp; storageMap)
</ins><span class="cx"> {
</span><span class="cx">     // FIXME: If it can't import, then the default WebKit behavior should be that of private browsing,
</span><span class="cx">     // not silently ignoring it. https://bugs.webkit.org/show_bug.cgi?id=25894
</span><span class="lines">@@ -143,7 +145,26 @@
</span><span class="cx">     if (!m_database.isOpen())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    // FIXME: Actually import the items.
</del><ins>+    SQLiteStatement query(m_database, &quot;SELECT key, value FROM ItemTable&quot;);
+    if (query.prepare() != SQLResultOk) {
+        LOG_ERROR(&quot;Unable to select items from ItemTable for local storage&quot;);
+        return;
+    }
+
+    HashMap&lt;String, String&gt; items;
+
+    int result = query.step();
+    while (result == SQLResultRow) {
+        items.set(query.getColumnText(0), query.getColumnBlobAsString(1));
+        result = query.step();
+    }
+
+    if (result != SQLResultDone) {
+        LOG_ERROR(&quot;Error reading items from ItemTable for local storage&quot;);
+        return;
+    }
+
+    storageMap.importItems(items);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>

</body>
</html>