<!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>[46502] trunk/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/46502">46502</a></dd>
<dt>Author</dt> <dd>jorlow@chromium.org</dd>
<dt>Date</dt> <dd>2009-07-28 15:26:16 -0700 (Tue, 28 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-07-28  Jeremy Orlow  &lt;jorlow@chromium.org&gt;

        Reviewed by Eric Seidel.

        Misc cleanup in DOM Storage.
        https://bugs.webkit.org/show_bug.cgi?id=27517

        The StorageAreaImpl changes are all for Chromium.  Because the DOM Storage implementation
        runs in a different process from where the Frame object lives, Chromium passes in NULL
        for the sourceFrame.  This affects events and handling privateBrowsing.  Chromium's
        incognito mode does not use the private browsing setting, so that's not a concern.  As for
        events, I've decided to simply disable them for now.

        The StorageNamespaceImpl changes get rid of a stale comment (path is .copy'ed for thread-
        safety) and to add an assert that .copy is only ever called on a SessionStorage namespace.

        Also cleaned up tailing whitespace in several parts of StorageAreaImpl.cpp

        * storage/StorageArea.cpp: Removed.  (It was empty anyway.)
        * storage/StorageAreaImpl.cpp:
        (WebCore::privateBrowsingEnabled): Factored out the check.
        (WebCore::StorageAreaImpl::setItem): Make frame optional.
        (WebCore::StorageAreaImpl::removeItem): ditto
        (WebCore::StorageAreaImpl::clear): ditto
        (WebCore::StorageAreaImpl::dispatchStorageEvent): Disable in Chromium for now.
        * storage/StorageNamespaceImpl.cpp:
        (WebCore::StorageNamespaceImpl::StorageNamespaceImpl): Remove stale comment.
        (WebCore::StorageNamespaceImpl::copy): Add assert that it's SessionStorage.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorestorageStorageAreaImplcpp">trunk/WebCore/storage/StorageAreaImpl.cpp</a></li>
<li><a href="#trunkWebCorestorageStorageNamespaceImplcpp">trunk/WebCore/storage/StorageNamespaceImpl.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebCorestorageStorageAreacpp">trunk/WebCore/storage/StorageArea.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (46501 => 46502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-28 21:57:14 UTC (rev 46501)
+++ trunk/WebCore/ChangeLog        2009-07-28 22:26:16 UTC (rev 46502)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2009-07-28  Jeremy Orlow  &lt;jorlow@chromium.org&gt;
+
+        Reviewed by Eric Seidel.
+
+        Misc cleanup in DOM Storage.
+        https://bugs.webkit.org/show_bug.cgi?id=27517
+
+        The StorageAreaImpl changes are all for Chromium.  Because the DOM Storage implementation
+        runs in a different process from where the Frame object lives, Chromium passes in NULL
+        for the sourceFrame.  This affects events and handling privateBrowsing.  Chromium's
+        incognito mode does not use the private browsing setting, so that's not a concern.  As for
+        events, I've decided to simply disable them for now.
+
+        The StorageNamespaceImpl changes get rid of a stale comment (path is .copy'ed for thread-
+        safety) and to add an assert that .copy is only ever called on a SessionStorage namespace.
+
+        Also cleaned up tailing whitespace in several parts of StorageAreaImpl.cpp
+
+        * storage/StorageArea.cpp: Removed.  (It was empty anyway.)
+        * storage/StorageAreaImpl.cpp:
+        (WebCore::privateBrowsingEnabled): Factored out the check.
+        (WebCore::StorageAreaImpl::setItem): Make frame optional.
+        (WebCore::StorageAreaImpl::removeItem): ditto
+        (WebCore::StorageAreaImpl::clear): ditto
+        (WebCore::StorageAreaImpl::dispatchStorageEvent): Disable in Chromium for now.
+        * storage/StorageNamespaceImpl.cpp:
+        (WebCore::StorageNamespaceImpl::StorageNamespaceImpl): Remove stale comment.
+        (WebCore::StorageNamespaceImpl::copy): Add assert that it's SessionStorage.
+
</ins><span class="cx"> 2009-07-28  Alpha Lam  &lt;hclam@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Levin.
</span></span></pre></div>
<a id="trunkWebCorestorageStorageAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/storage/StorageAreaImpl.cpp (46501 => 46502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/storage/StorageAreaImpl.cpp        2009-07-28 21:57:14 UTC (rev 46501)
+++ trunk/WebCore/storage/StorageAreaImpl.cpp        2009-07-28 22:26:16 UTC (rev 46502)
</span><span class="lines">@@ -20,9 +20,9 @@
</span><span class="cx">  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx">  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx">  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx">  */
</span><del>- 
</del><ins>+
</ins><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;StorageAreaImpl.h&quot;
</span><span class="cx"> 
</span><span class="lines">@@ -87,6 +87,19 @@
</span><span class="cx">     ASSERT(!m_isShutdown);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static bool privateBrowsingEnabled(Frame* frame)
+{
+#if PLATFORM(CHROMIUM)
+    // The frame pointer can be NULL in Chromium since this call is made in a different
+    // process from where the Frame object exists.  Luckily, private browseing is
+    // implemented differently in Chromium, so it'd never return true anyway.
+    ASSERT(!frame);
+    return false;
+#else
+    return frame-&gt;page()-&gt;settings()-&gt;privateBrowsingEnabled();
+#endif
+}
+
</ins><span class="cx"> unsigned StorageAreaImpl::length() const
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_isShutdown);
</span><span class="lines">@@ -97,14 +110,14 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_isShutdown);
</span><span class="cx">     blockUntilImportComplete();
</span><del>-    
</del><ins>+
</ins><span class="cx">     String key;
</span><del>-    
</del><ins>+
</ins><span class="cx">     if (!m_storageMap-&gt;key(index, key)) {
</span><span class="cx">         ec = INDEX_SIZE_ERR;
</span><span class="cx">         return String();
</span><span class="cx">     }
</span><del>-        
</del><ins>+
</ins><span class="cx">     return key;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -112,7 +125,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_isShutdown);
</span><span class="cx">     blockUntilImportComplete();
</span><del>-    
</del><ins>+
</ins><span class="cx">     return m_storageMap-&gt;getItem(key);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -121,8 +134,8 @@
</span><span class="cx">     ASSERT(!m_isShutdown);
</span><span class="cx">     ASSERT(!value.isNull());
</span><span class="cx">     blockUntilImportComplete();
</span><del>-    
-    if (frame-&gt;page()-&gt;settings()-&gt;privateBrowsingEnabled()) {
</del><ins>+
+    if (privateBrowsingEnabled(frame)) {
</ins><span class="cx">         ec = QUOTA_EXCEEDED_ERR;
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="lines">@@ -133,10 +146,10 @@
</span><span class="cx">     //     ec = QUOTA_EXCEEDED_ERR;
</span><span class="cx">     //     return;
</span><span class="cx">     // }
</span><del>-    
-    String oldValue;   
</del><ins>+
+    String oldValue;
</ins><span class="cx">     RefPtr&lt;StorageMap&gt; newMap = m_storageMap-&gt;setItem(key, value, oldValue);
</span><del>-    
</del><ins>+
</ins><span class="cx">     if (newMap)
</span><span class="cx">         m_storageMap = newMap.release();
</span><span class="cx"> 
</span><span class="lines">@@ -152,8 +165,8 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_isShutdown);
</span><span class="cx">     blockUntilImportComplete();
</span><del>-    
-    if (frame-&gt;page()-&gt;settings()-&gt;privateBrowsingEnabled())
</del><ins>+
+    if (privateBrowsingEnabled(frame))
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     String oldValue;
</span><span class="lines">@@ -173,12 +186,12 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_isShutdown);
</span><span class="cx">     blockUntilImportComplete();
</span><del>-    
-    if (frame-&gt;page()-&gt;settings()-&gt;privateBrowsingEnabled())
</del><ins>+
+    if (privateBrowsingEnabled(frame))
</ins><span class="cx">         return;
</span><del>-    
</del><ins>+
</ins><span class="cx">     m_storageMap = StorageMap::create();
</span><del>-    
</del><ins>+
</ins><span class="cx">     if (m_storageAreaSync)
</span><span class="cx">         m_storageAreaSync-&gt;scheduleClear();
</span><span class="cx">     dispatchStorageEvent(String(), String(), String(), frame);
</span><span class="lines">@@ -188,7 +201,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_isShutdown);
</span><span class="cx">     blockUntilImportComplete();
</span><del>-    
</del><ins>+
</ins><span class="cx">     return m_storageMap-&gt;contains(key);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -221,22 +234,25 @@
</span><span class="cx"> 
</span><span class="cx"> void StorageAreaImpl::dispatchStorageEvent(const String&amp; key, const String&amp; oldValue, const String&amp; newValue, Frame* sourceFrame)
</span><span class="cx"> {
</span><del>-    // We need to copy all relevant frames from every page to a vector since sending the event to one frame might mutate the frame tree
-    // of any given page in the group or mutate the page group itself.
-    Vector&lt;RefPtr&lt;Frame&gt; &gt; frames;
</del><ins>+#if PLATFORM(CHROMIUM)
+    // FIXME: Events are currently broken in Chromium.
+    return;
+#endif
</ins><span class="cx"> 
</span><del>-    // FIXME: When can this occur?
</del><span class="cx">     Page* page = sourceFrame-&gt;page();
</span><span class="cx">     if (!page)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    // We need to copy all relevant frames from every page to a vector since sending the event to one frame might mutate the frame tree
+    // of any given page in the group or mutate the page group itself.
+    Vector&lt;RefPtr&lt;Frame&gt; &gt; frames;
</ins><span class="cx">     if (m_storageType == SessionStorage) {
</span><span class="cx">         // Send events only to our page.
</span><span class="cx">         for (Frame* frame = page-&gt;mainFrame(); frame; frame = frame-&gt;tree()-&gt;traverseNext()) {
</span><span class="cx">             if (frame-&gt;document()-&gt;securityOrigin()-&gt;equal(securityOrigin()))
</span><span class="cx">                 frames.append(frame);
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         for (unsigned i = 0; i &lt; frames.size(); ++i)
</span><span class="cx">             frames[i]-&gt;document()-&gt;dispatchWindowEvent(StorageEvent::create(eventNames().storageEvent, key, oldValue, newValue, sourceFrame-&gt;document()-&gt;documentURI(), sourceFrame-&gt;domWindow(), frames[i]-&gt;domWindow()-&gt;sessionStorage()));
</span><span class="cx">     } else {
</span><span class="lines">@@ -249,10 +265,10 @@
</span><span class="cx">                     frames.append(frame);
</span><span class="cx">             }
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         for (unsigned i = 0; i &lt; frames.size(); ++i)
</span><span class="cx">             frames[i]-&gt;document()-&gt;dispatchWindowEvent(StorageEvent::create(eventNames().storageEvent, key, oldValue, newValue, sourceFrame-&gt;document()-&gt;documentURI(), sourceFrame-&gt;domWindow(), frames[i]-&gt;domWindow()-&gt;localStorage()));
</span><del>-    }        
</del><ins>+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorestorageStorageNamespaceImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/storage/StorageNamespaceImpl.cpp (46501 => 46502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/storage/StorageNamespaceImpl.cpp        2009-07-28 21:57:14 UTC (rev 46501)
+++ trunk/WebCore/storage/StorageNamespaceImpl.cpp        2009-07-28 22:26:16 UTC (rev 46502)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> 
</span><span class="cx"> StorageNamespaceImpl::StorageNamespaceImpl(StorageType storageType, const String&amp; path)
</span><span class="cx">     : m_storageType(storageType)
</span><del>-    , m_path(path.copy())  // FIXME: Is the .copy necessary?
</del><ins>+    , m_path(path.copy())  // Copy makes it safe for our other thread to access the path.
</ins><span class="cx">     , m_syncManager(0)
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     , m_isShutdown(false)
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><span class="cx">     ASSERT(!m_isShutdown);
</span><ins>+    ASSERT(m_storageType == SessionStorage);
</ins><span class="cx"> 
</span><span class="cx">     StorageNamespaceImpl* newNamespace = new StorageNamespaceImpl(m_storageType, m_path);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>