Title: [177207] tags/Safari-601.1.12/Source/WebKit2
Diff
Modified: tags/Safari-601.1.12/Source/WebKit2/ChangeLog (177206 => 177207)
--- tags/Safari-601.1.12/Source/WebKit2/ChangeLog 2014-12-12 03:01:40 UTC (rev 177206)
+++ tags/Safari-601.1.12/Source/WebKit2/ChangeLog 2014-12-12 03:02:21 UTC (rev 177207)
@@ -1,5 +1,23 @@
2014-12-11 Babak Shafiei <[email protected]>
+ Merge r177205.
+
+ 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 Babak Shafiei <[email protected]>
+
Merge r177196.
2014-12-11 Commit Queue <[email protected]>
Modified: tags/Safari-601.1.12/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h (177206 => 177207)
--- tags/Safari-601.1.12/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-12 03:01:40 UTC (rev 177206)
+++ tags/Safari-601.1.12/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-12 03:02:21 UTC (rev 177207)
@@ -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: tags/Safari-601.1.12/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp (177206 => 177207)
--- tags/Safari-601.1.12/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp 2014-12-12 03:01:40 UTC (rev 177206)
+++ tags/Safari-601.1.12/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp 2014-12-12 03:02:21 UTC (rev 177207)
@@ -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
