Changeset 54046 in webkit

Timestamp:

Jan 28, 2010 11:15:20 PM (14 years ago)

Author:

jorlow@chromium.org

Message:

2010-01-28 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by Darin Fisher.

StorageNamespaceProxy::copy() should be a no-op
​https://bugs.webkit.org/show_bug.cgi?id=34298

The comment in the code should make clear why.

• public/WebViewClient.h:
• src/StorageNamespaceProxy.cpp: (WebCore::StorageNamespaceProxy::copy):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebViewClient.h (modified) (2 diffs)
• src/StorageNamespaceProxy.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-01-28  Jeremy Orlow  <jorlow@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        StorageNamespaceProxy::copy() should be a no-op
+        https://bugs.webkit.org/show_bug.cgi?id=34298
+
+        The comment in the code should make clear why.
+
+        * public/WebViewClient.h:
+        * src/StorageNamespaceProxy.cpp:
+        (WebCore::StorageNamespaceProxy::copy):
+
 2010-01-28  Michael Nordman  <michaeln@google.com>
 

trunk/WebKit/chromium/public/WebViewClient.h

@@ -66 +66 @@
     // Factory methods -----------------------------------------------------
 
-    // Create a new related WebView.
+    // Create a new related WebView.  This method must clone its session storage
+    // so any subsequent calls to createSessionStorageNamespace conform to the
+    // WebStorage specification.
     virtual WebView* createView(WebFrame* creator) { return 0; }
 
@@ -74 +76 @@
     virtual WebWidget* createPopupMenu(const WebPopupMenuInfo&) { return 0; }
 
-    // Create a session storage namespace associated with this WebView.
+    // Create a session storage namespace object associated with this WebView.
     virtual WebStorageNamespace* createSessionStorageNamespace() { return 0; }
 

trunk/WebKit/chromium/src/StorageNamespaceProxy.cpp

@@ -67 +67 @@
 PassRefPtr<StorageNamespace> StorageNamespaceProxy::copy()
 {
-    return adoptRef(new StorageNamespaceProxy(m_storageNamespace->copy(), m_storageType));
+    ASSERT(m_storageType == SessionStorage);
+    // The WebViewClient knows what its session storage namespace id is but we
+    // do not.  Returning 0 here causes it to be fetched (via the WebViewClient)
+    // on its next use.  Note that it is WebViewClient::createView's
+    // responsibility to clone the session storage namespace id and that the
+    // only time copy() is called is directly after the createView call...which
+    // is why all of this is safe.
+    return 0;
 }