Title: [177205] trunk/Source/WebKit2
- Revision
- 177205
- Author
- [email protected]
- Date
- 2014-12-11 18:50:08 -0800 (Thu, 11 Dec 2014)
Log Message
Temporarily use WebCore session storage for transient local storage
https://bugs.webkit.org/show_bug.cgi?id=139574
Reviewed by Dan Bernstein.
* WebProcess/Storage/StorageNamespaceImpl.h:
Change the header guard so it won't conflict with StorageNamespaceImpl.h in WebCore.
* WebProcess/Storage/WebStorageNamespaceProvider.cpp:
(WebKit::WebStorageNamespaceProvider::createTransientLocalStorageNamespace):
Use the WebCore session storage for now, to avoid crashes.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177204 => 177205)
--- trunk/Source/WebKit2/ChangeLog 2014-12-12 02:45:52 UTC (rev 177204)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-12 02:50:08 UTC (rev 177205)
@@ -1,3 +1,17 @@
+2014-12-11 Anders Carlsson <[email protected]>
+
+ Temporarily use WebCore session storage for transient local storage
+ https://bugs.webkit.org/show_bug.cgi?id=139574
+
+ Reviewed by Dan Bernstein.
+
+ * WebProcess/Storage/StorageNamespaceImpl.h:
+ Change the header guard so it won't conflict with StorageNamespaceImpl.h in WebCore.
+
+ * WebProcess/Storage/WebStorageNamespaceProvider.cpp:
+ (WebKit::WebStorageNamespaceProvider::createTransientLocalStorageNamespace):
+ Use the WebCore session storage for now, to avoid crashes.
+
2014-12-11 Commit Queue <[email protected]>
Unreviewed, rolling out r177081.
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h (177204 => 177205)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-12 02:45:52 UTC (rev 177204)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-12 02:50:08 UTC (rev 177205)
@@ -23,8 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef StorageNamespaceImpl_h
-#define StorageNamespaceImpl_h
+#ifndef WebStorageNamespaceImpl_h
+#define WebStorageNamespaceImpl_h
#include <WebCore/SecurityOriginHash.h>
#include <WebCore/StorageArea.h>
@@ -77,4 +77,4 @@
} // namespace WebKit
-#endif // StorageNamespaceImpl_h
+#endif // WebStorageNamespaceImpl_h
Modified: trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp (177204 => 177205)
--- trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp 2014-12-12 02:45:52 UTC (rev 177204)
+++ trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp 2014-12-12 02:50:08 UTC (rev 177205)
@@ -28,6 +28,7 @@
#include "StorageNamespaceImpl.h"
#include "WebPage.h"
+#include <WebCore/StorageNamespaceImpl.h>
#include <wtf/HashMap.h>
#include <wtf/NeverDestroyed.h>
@@ -78,7 +79,8 @@
RefPtr<WebCore::StorageNamespace> WebStorageNamespaceProvider::createTransientLocalStorageNamespace(WebCore::SecurityOrigin& topLevelOrigin, unsigned quota)
{
- return StorageNamespaceImpl::createTransientLocalStorageNamespace(m_identifier, topLevelOrigin, quota);
+ // FIXME: This shouldn't use WebCore session storage.
+ return WebCore::StorageNamespaceImpl::createSessionStorageNamespace(quota);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
