Changeset 211125 in webkit

Timestamp:

Jan 24, 2017, 5:43:21 PM (10 years ago)

Author:

Brent Fulgham

Message:

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.

Source/WebCore:

• page/SecurityOrigin.cpp:

(WebCore::SecurityOrigin::canDisplay): Exclude the new check when building on iOS.

LayoutTests:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-simulator/fast/xmlhttprequest (added)
• LayoutTests/platform/ios-simulator/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt (added)
• LayoutTests/platform/ios-simulator/storage (added)
• LayoutTests/platform/ios-simulator/storage/domstorage (added)
• LayoutTests/platform/ios-simulator/storage/domstorage/sessionstorage (added)
• LayoutTests/platform/ios-simulator/storage/domstorage/sessionstorage/blocked-file-access-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/SecurityOrigin.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-01-24  Brent Fulgham  <bfulgham@apple.com>
+
+        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-24  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-24  Brent Fulgham  <bfulgham@apple.com>
+
+        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-24  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/page/SecurityOrigin.cpp

@@ -305 +305 @@
         return true;
 
+#if !PLATFORM(IOS)
     if (m_protocol == "file" && url.isLocalFile() && !filesHaveSameVolume(m_filePath, url.path()))
         return false;
+#endif
 
     if (isFeedWithNestedProtocolInHTTPFamily(url))