Title: [293790] trunk
- Revision
- 293790
- Author
- katherine_che...@apple.com
- Date
- 2022-05-04 14:18:42 -0700 (Wed, 04 May 2022)
Log Message
REGRESSION (r293427): [ iOS ] http/tests/quicklook/same-origin-xmlhttprequest-allowed.html is a constant crash and failure (240024)
https://bugs.webkit.org/show_bug.cgi?id=240024
rdar://92678727
Reviewed by Wenson Hsieh.
Source/WebCore:
No new tests, this will fix a failing test.
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::isLoadingRemoteArchive):
(WebCore::DocumentLoader::commitData):
(WebCore::DocumentLoader::scheduleArchiveLoad):
* loader/DocumentLoader.h:
LayoutTests:
* platform/ios/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (293789 => 293790)
--- trunk/LayoutTests/ChangeLog 2022-05-04 20:59:37 UTC (rev 293789)
+++ trunk/LayoutTests/ChangeLog 2022-05-04 21:18:42 UTC (rev 293790)
@@ -1,3 +1,13 @@
+2022-05-04 Kate Cheney <katherine_che...@apple.com>
+
+ REGRESSION (r293427): [ iOS ] http/tests/quicklook/same-origin-xmlhttprequest-allowed.html is a constant crash and failure (240024)
+ https://bugs.webkit.org/show_bug.cgi?id=240024
+ rdar://92678727
+
+ Reviewed by Wenson Hsieh.
+
+ * platform/ios/TestExpectations:
+
2022-05-04 Karl Rackler <rack...@apple.com>
[Gardening][iOS Mac ] imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/same-hash.html is a flaky text failure
Modified: trunk/LayoutTests/platform/ios/TestExpectations (293789 => 293790)
--- trunk/LayoutTests/platform/ios/TestExpectations 2022-05-04 20:59:37 UTC (rev 293789)
+++ trunk/LayoutTests/platform/ios/TestExpectations 2022-05-04 21:18:42 UTC (rev 293790)
@@ -3593,8 +3593,6 @@
# iOS has a WebGPU implementation.
http/tests/webgpu [ Pass ]
-webkit.org/b/240024 http/tests/quicklook/same-origin-xmlhttprequest-allowed.html [ Pass Failure Crash ]
-
webkit.org/b/240037 css3/background/background-repeat-space-content.html [ Pass ImageOnlyFailure ]
webkit.org/b/240065 fast/forms/auto-fill-button/input-auto-fill-button.html [ Pass Failure ]
Modified: trunk/Source/WebCore/ChangeLog (293789 => 293790)
--- trunk/Source/WebCore/ChangeLog 2022-05-04 20:59:37 UTC (rev 293789)
+++ trunk/Source/WebCore/ChangeLog 2022-05-04 21:18:42 UTC (rev 293790)
@@ -1,3 +1,19 @@
+2022-05-04 Kate Cheney <katherine_che...@apple.com>
+
+ REGRESSION (r293427): [ iOS ] http/tests/quicklook/same-origin-xmlhttprequest-allowed.html is a constant crash and failure (240024)
+ https://bugs.webkit.org/show_bug.cgi?id=240024
+ rdar://92678727
+
+ Reviewed by Wenson Hsieh.
+
+ No new tests, this will fix a failing test.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::isLoadingRemoteArchive):
+ (WebCore::DocumentLoader::commitData):
+ (WebCore::DocumentLoader::scheduleArchiveLoad):
+ * loader/DocumentLoader.h:
+
2022-05-04 Brent Fulgham <bfulg...@apple.com>
Remove deprecated 'JavaEnabled' feature flag and related code
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (293789 => 293790)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2022-05-04 20:59:37 UTC (rev 293789)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2022-05-04 21:18:42 UTC (rev 293790)
@@ -1213,10 +1213,21 @@
}
#endif
+#if ENABLE(WEB_ARCHIVE)
+bool DocumentLoader::isLoadingRemoteArchive() const
+{
+ bool isQuickLookPreview = false;
+#if USE(QUICK_LOOK)
+ isQuickLookPreview = isQuickLookPreviewURL(m_response.url());
+#endif
+ return m_archive && !m_frame->settings().webArchiveTestingModeEnabled() && !isQuickLookPreview;
+}
+#endif
+
void DocumentLoader::commitData(const SharedBuffer& data)
{
#if ENABLE(WEB_ARCHIVE)
- URL documentOrEmptyURL = m_archive && !m_frame->settings().webArchiveTestingModeEnabled() ? URL() : documentURL();
+ URL documentOrEmptyURL = isLoadingRemoteArchive() ? URL() : documentURL();
#else
URL documentOrEmptyURL = documentURL();
#endif
@@ -1245,7 +1256,7 @@
return;
#if ENABLE(WEB_ARCHIVE)
- if (m_archive && !m_frame->settings().webArchiveTestingModeEnabled()) {
+ if (isLoadingRemoteArchive()) {
document.setBaseURLOverride(m_archive->mainResource()->url());
if (LegacySchemeRegistry::shouldTreatURLSchemeAsLocal(documentURL().protocol().toStringWithoutCopying()))
document.securityOrigin().grantLoadLocalResources();
@@ -1801,7 +1812,7 @@
return false;
#if ENABLE(WEB_ARCHIVE)
- if (!m_frame->settings().webArchiveTestingModeEnabled()) {
+ if (isLoadingRemoteArchive()) {
DOCUMENTLOADER_RELEASE_LOG("scheduleArchiveLoad: Failed to unarchive subresource");
loader.didFail(ResourceError(errorDomainWebKitInternal, 0, request.url(), "Failed to unarchive subresource"_s));
return true;
Modified: trunk/Source/WebCore/loader/DocumentLoader.h (293789 => 293790)
--- trunk/Source/WebCore/loader/DocumentLoader.h 2022-05-04 20:59:37 UTC (rev 293789)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2022-05-04 21:18:42 UTC (rev 293790)
@@ -503,6 +503,10 @@
void clearArchiveResources();
#endif
+#if ENABLE(WEB_ARCHIVE)
+ bool isLoadingRemoteArchive() const;
+#endif
+
void willSendRequest(ResourceRequest&&, const ResourceResponse&, CompletionHandler<void(ResourceRequest&&)>&&);
void finishedLoading();
void mainReceivedError(const ResourceError&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
