<!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>[150309] 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/150309">150309</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-05-17 16:45:25 -0700 (Fri, 17 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move Storage member functions out of line
https://bugs.webkit.org/show_bug.cgi?id=116364

Reviewed by Andreas Kling.

This is preparation for sharing more code between the WebKit1 and WebKit2 storage area subclasses.
Also remove unnecessary null checks and make m_storageArea const.

* storage/Storage.cpp:
(WebCore::Storage::length):
(WebCore::Storage::key):
(WebCore::Storage::getItem):
(WebCore::Storage::setItem):
(WebCore::Storage::removeItem):
(WebCore::Storage::clear):
(WebCore::Storage::contains):
* storage/Storage.h:
(WebCore::Storage::area):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestorageStoragecpp">trunk/Source/WebCore/storage/Storage.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageh">trunk/Source/WebCore/storage/Storage.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (150308 => 150309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-17 23:35:26 UTC (rev 150308)
+++ trunk/Source/WebCore/ChangeLog        2013-05-17 23:45:25 UTC (rev 150309)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2013-05-17  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Move Storage member functions out of line
+        https://bugs.webkit.org/show_bug.cgi?id=116364
+
+        Reviewed by Andreas Kling.
+
+        This is preparation for sharing more code between the WebKit1 and WebKit2 storage area subclasses.
+        Also remove unnecessary null checks and make m_storageArea const.
+
+        * storage/Storage.cpp:
+        (WebCore::Storage::length):
+        (WebCore::Storage::key):
+        (WebCore::Storage::getItem):
+        (WebCore::Storage::setItem):
+        (WebCore::Storage::removeItem):
+        (WebCore::Storage::clear):
+        (WebCore::Storage::contains):
+        * storage/Storage.h:
+        (WebCore::Storage::area):
+
</ins><span class="cx"> 2013-05-17  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Headers and footers will sometimes disappear and re-appear during page loads
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/Storage.cpp (150308 => 150309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/Storage.cpp        2013-05-17 23:35:26 UTC (rev 150308)
+++ trunk/Source/WebCore/storage/Storage.cpp        2013-05-17 23:45:25 UTC (rev 150309)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include &quot;Frame.h&quot;
</span><span class="cx"> #include &quot;Page.h&quot;
</span><span class="cx"> #include &quot;Settings.h&quot;
</span><ins>+#include &quot;StorageArea.h&quot;
</ins><span class="cx"> #include &lt;wtf/PassRefPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/text/WTFString.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -45,14 +46,48 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_frame);
</span><span class="cx">     ASSERT(m_storageArea);
</span><del>-    if (m_storageArea)
-        m_storageArea-&gt;incrementAccessCount();
</del><ins>+
+    m_storageArea-&gt;incrementAccessCount();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Storage::~Storage()
</span><span class="cx"> {
</span><del>-    if (m_storageArea)
-        m_storageArea-&gt;decrementAccessCount();
</del><ins>+    m_storageArea-&gt;decrementAccessCount();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+unsigned Storage::length(ExceptionCode&amp; ec) const
+{
+    return m_storageArea-&gt;length(ec, m_frame);
</ins><span class="cx"> }
</span><ins>+
+String Storage::key(unsigned index, ExceptionCode&amp; ec) const
+{
+    return m_storageArea-&gt;key(index, ec, m_frame);
+}
+
+String Storage::getItem(const String&amp; key, ExceptionCode&amp; ec) const
+{
+    return m_storageArea-&gt;getItem(key, ec, m_frame);
+}
+
+void Storage::setItem(const String&amp; key, const String&amp; value, ExceptionCode&amp; ec)
+{
+    m_storageArea-&gt;setItem(key, value, ec, m_frame);
+}
+
+void Storage::removeItem(const String&amp; key, ExceptionCode&amp; ec)
+{
+    m_storageArea-&gt;removeItem(key, ec, m_frame);
+}
+
+void Storage::clear(ExceptionCode&amp; ec)
+{
+    m_storageArea-&gt;clear(ec, m_frame);
+}
+
+bool Storage::contains(const String&amp; key, ExceptionCode&amp; ec) const
+{
+    return m_storageArea-&gt;contains(key, ec, m_frame);
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorestorageStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/Storage.h (150308 => 150309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/Storage.h        2013-05-17 23:35:26 UTC (rev 150308)
+++ trunk/Source/WebCore/storage/Storage.h        2013-05-17 23:45:25 UTC (rev 150309)
</span><span class="lines">@@ -28,37 +28,38 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;DOMWindowProperty.h&quot;
</span><span class="cx"> #include &quot;ScriptWrappable.h&quot;
</span><del>-#include &quot;StorageArea.h&quot;
</del><span class="cx"> #include &lt;wtf/Forward.h&gt;
</span><span class="cx"> #include &lt;wtf/RefCounted.h&gt;
</span><span class="cx"> #include &lt;wtf/RefPtr.h&gt;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-    class Frame;
-    typedef int ExceptionCode;
</del><ins>+class Frame;
+class StorageArea;
</ins><span class="cx"> 
</span><del>-    class Storage : public ScriptWrappable, public RefCounted&lt;Storage&gt;, public DOMWindowProperty {
-    public:
-        static PassRefPtr&lt;Storage&gt; create(Frame*, PassRefPtr&lt;StorageArea&gt;);
-        ~Storage();
</del><ins>+typedef int ExceptionCode;
</ins><span class="cx"> 
</span><del>-        unsigned length(ExceptionCode&amp; ec) const { return m_storageArea-&gt;length(ec, m_frame); }
-        String key(unsigned index, ExceptionCode&amp; ec) const { return m_storageArea-&gt;key(index, ec, m_frame); }
-        String getItem(const String&amp; key, ExceptionCode&amp; ec) const { return m_storageArea-&gt;getItem(key, ec, m_frame); }
-        void setItem(const String&amp; key, const String&amp; value, ExceptionCode&amp; ec) { m_storageArea-&gt;setItem(key, value, ec, m_frame); }
-        void removeItem(const String&amp; key, ExceptionCode&amp; ec) { m_storageArea-&gt;removeItem(key, ec, m_frame); }
-        void clear(ExceptionCode&amp; ec) { m_storageArea-&gt;clear(ec, m_frame); }
-        bool contains(const String&amp; key, ExceptionCode&amp; ec) const { return m_storageArea-&gt;contains(key, ec, m_frame); }
</del><ins>+class Storage : public ScriptWrappable, public RefCounted&lt;Storage&gt;, public DOMWindowProperty {
+public:
+    static PassRefPtr&lt;Storage&gt; create(Frame*, PassRefPtr&lt;StorageArea&gt;);
+    ~Storage();
</ins><span class="cx"> 
</span><del>-        StorageArea* area() const { return m_storageArea.get(); }
</del><ins>+    unsigned length(ExceptionCode&amp;) const;
+    String key(unsigned index, ExceptionCode&amp;) const;
+    String getItem(const String&amp; key, ExceptionCode&amp;) const;
+    void setItem(const String&amp; key, const String&amp; value, ExceptionCode&amp;);
+    void removeItem(const String&amp; key, ExceptionCode&amp;);
+    void clear(ExceptionCode&amp;);
+    bool contains(const String&amp; key, ExceptionCode&amp;) const;
</ins><span class="cx"> 
</span><del>-    private:
-        Storage(Frame*, PassRefPtr&lt;StorageArea&gt;);
</del><ins>+    StorageArea * area() const { return m_storageArea.get(); }
</ins><span class="cx"> 
</span><del>-        RefPtr&lt;StorageArea&gt; m_storageArea;
-    };
</del><ins>+private:
+    Storage(Frame*, PassRefPtr&lt;StorageArea&gt;);
</ins><span class="cx"> 
</span><ins>+    const RefPtr&lt;StorageArea&gt; m_storageArea;
+};
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif // Storage_h
</span></span></pre>
</div>
</div>

</body>
</html>