Title: [177321] tags/Safari-601.1.12.2/Source/WebKit
- Revision
- 177321
- Author
- [email protected]
- Date
- 2014-12-15 16:00:53 -0800 (Mon, 15 Dec 2014)
Log Message
Merged r177233. rdar://problems/19236505
Modified Paths
Diff
Modified: tags/Safari-601.1.12.2/Source/WebKit/ChangeLog (177320 => 177321)
--- tags/Safari-601.1.12.2/Source/WebKit/ChangeLog 2014-12-16 00:00:48 UTC (rev 177320)
+++ tags/Safari-601.1.12.2/Source/WebKit/ChangeLog 2014-12-16 00:00:53 UTC (rev 177321)
@@ -1,3 +1,18 @@
+2014-12-15 Matthew Hanson <[email protected]>
+
+ Merge r177233. rdar://problem/19236505
+
+ 2014-12-12 Anders Carlsson <[email protected]>
+
+ Handle null local storage database URLs
+ https://bugs.webkit.org/show_bug.cgi?id=139594
+ <rdar://problem/19236505>
+
+ Reviewed by Beth Dakin.
+
+ * Storage/WebStorageNamespaceProvider.cpp:
+ (WebStorageNamespaceProvider::WebStorageNamespaceProvider):
+
2014-12-11 Anders Carlsson <[email protected]>
Build fix.
Modified: tags/Safari-601.1.12.2/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp (177320 => 177321)
--- tags/Safari-601.1.12.2/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2014-12-16 00:00:48 UTC (rev 177320)
+++ tags/Safari-601.1.12.2/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2014-12-16 00:00:53 UTC (rev 177321)
@@ -43,7 +43,7 @@
}
WebStorageNamespaceProvider::WebStorageNamespaceProvider(const String& localStorageDatabasePath)
- : m_localStorageDatabasePath(localStorageDatabasePath)
+ : m_localStorageDatabasePath(localStorageDatabasePath.isNull() ? emptyString() : localStorageDatabasePath)
{
storageNamespaceProviders().add(this);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
