Title: [211187] branches/safari-603-branch
- Revision
- 211187
- Author
- [email protected]
- Date
- 2017-01-25 17:41:00 -0800 (Wed, 25 Jan 2017)
Log Message
Merge r211125. rdar://problem/30074665
Modified Paths
Added Paths
Diff
Modified: branches/safari-603-branch/LayoutTests/ChangeLog (211186 => 211187)
--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-26 01:40:57 UTC (rev 211186)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-26 01:41:00 UTC (rev 211187)
@@ -1,3 +1,24 @@
+2017-01-25 Matthew Hanson <[email protected]>
+
+ Merge r211125. rdar://problem/30074665
+
+ 2017-01-24 Brent Fulgham <[email protected]>
+
+ Bug 167392: REGRESSION(r210531): Relax same-volume display requirement for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=167392
+ <rdar://problem/30074665>
+
+ Reviewed by Brady Eidson.
+
+ Rebaseline two tests for ios-simulator, now that they exclude the cross-volume file check..
+
+ * platform/ios-simulator/fast/xmlhttprequest: Added.
+ * platform/ios-simulator/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt: Added.
+ * platform/ios-simulator/storage: Added.
+ * platform/ios-simulator/storage/domstorage: Added.
+ * platform/ios-simulator/storage/domstorage/sessionstorage: Added.
+ * platform/ios-simulator/storage/domstorage/sessionstorage/blocked-file-access-expected.txt: Added.
+
2017-01-25 Ryan Haddad <[email protected]>
Unreviewed test gardening.
Added: branches/safari-603-branch/LayoutTests/platform/ios-simulator/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt (0 => 211187)
--- branches/safari-603-branch/LayoutTests/platform/ios-simulator/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt 2017-01-26 01:41:00 UTC (rev 211187)
@@ -0,0 +1,14 @@
+
+Bug 22475: REGRESSION: Async XMLHttpRequest never finishes on nonexistent files anymore
+
+In both cases, readyState 4 should be reached. Because one of the requests is synchronous and for a file: URL, only a single error handler should be invoked.
+
+Doing an XHR to a nonexistent file.
+ReadyState handler: readyState = 1
+ReadyState handler: readyState = 4
+Error handler: readyState = 4
+
+Doing an XHR to a directory.
+ReadyState handler: readyState = 1
+ReadyState handler: readyState = 4
+
Added: branches/safari-603-branch/LayoutTests/platform/ios-simulator/storage/domstorage/sessionstorage/blocked-file-access-expected.txt (0 => 211187)
--- branches/safari-603-branch/LayoutTests/platform/ios-simulator/storage/domstorage/sessionstorage/blocked-file-access-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator/storage/domstorage/sessionstorage/blocked-file-access-expected.txt 2017-01-26 01:41:00 UTC (rev 211187)
@@ -0,0 +1,3 @@
+CONSOLE MESSAGE: line 10: PASS: window.sessionStorage was accessible
+
+Test that we are permitted access to sessionStorage from a file URL if universal access is turned off.
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211186 => 211187)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-26 01:40:57 UTC (rev 211186)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-26 01:41:00 UTC (rev 211187)
@@ -1,5 +1,20 @@
2017-01-25 Matthew Hanson <[email protected]>
+ Merge r211125. rdar://problem/30074665
+
+ 2017-01-24 Brent Fulgham <[email protected]>
+
+ Bug 167392: REGRESSION(r210531): Relax same-volume display requirement for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=167392
+ <rdar://problem/30074665>
+
+ Reviewed by Brady Eidson.
+
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::canDisplay): Exclude the new check when building on iOS.
+
+2017-01-25 Matthew Hanson <[email protected]>
+
Merge r211137. rdar://problem/29896656
2017-01-24 Alex Christensen <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/page/SecurityOrigin.cpp (211186 => 211187)
--- branches/safari-603-branch/Source/WebCore/page/SecurityOrigin.cpp 2017-01-26 01:40:57 UTC (rev 211186)
+++ branches/safari-603-branch/Source/WebCore/page/SecurityOrigin.cpp 2017-01-26 01:41:00 UTC (rev 211187)
@@ -304,8 +304,10 @@
if (m_universalAccess)
return true;
+#if !PLATFORM(IOS)
if (m_protocol == "file" && url.isLocalFile() && !filesHaveSameVolume(m_filePath, url.path()))
return false;
+#endif
if (isFeedWithNestedProtocolInHTTPFamily(url))
return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
