Title: [254628] trunk
- Revision
- 254628
- Author
- aakash_j...@apple.com
- Date
- 2020-01-15 12:21:53 -0800 (Wed, 15 Jan 2020)
Log Message
Unreviewed, rolling out r254576.
https://bugs.webkit.org/show_bug.cgi?id=206306
Introduced failing test loader/change-src-during-iframe-load-
crash.html (Requested by aakashja_ on #webkit).
Reverted changeset:
"Null Ptr Deref @
WebCore::DocumentLoader::clearMainResourceLoader"
https://bugs.webkit.org/show_bug.cgi?id=206204
https://trac.webkit.org/changeset/254576
Patch by Commit Queue <commit-qu...@webkit.org> on 2020-01-15
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (254627 => 254628)
--- trunk/LayoutTests/ChangeLog 2020-01-15 20:18:57 UTC (rev 254627)
+++ trunk/LayoutTests/ChangeLog 2020-01-15 20:21:53 UTC (rev 254628)
@@ -1,3 +1,18 @@
+2020-01-15 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r254576.
+ https://bugs.webkit.org/show_bug.cgi?id=206306
+
+ Introduced failing test loader/change-src-during-iframe-load-
+ crash.html (Requested by aakashja_ on #webkit).
+
+ Reverted changeset:
+
+ "Null Ptr Deref @
+ WebCore::DocumentLoader::clearMainResourceLoader"
+ https://bugs.webkit.org/show_bug.cgi?id=206204
+ https://trac.webkit.org/changeset/254576
+
2020-01-15 Truitt Savell <tsav...@apple.com>
REGRESSION: [ Mac wk2 ] tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler.html is a flaky failure on Mac wk2
Modified: trunk/LayoutTests/http/tests/security/http-0.9/xhr-blocked-expected.txt (254627 => 254628)
--- trunk/LayoutTests/http/tests/security/http-0.9/xhr-blocked-expected.txt 2020-01-15 20:18:57 UTC (rev 254627)
+++ trunk/LayoutTests/http/tests/security/http-0.9/xhr-blocked-expected.txt 2020-01-15 20:21:53 UTC (rev 254628)
@@ -1,3 +1,2 @@
-asdf
ALERT: PASS
Deleted: trunk/LayoutTests/loader/change-src-during-iframe-load-crash-expected.txt (254627 => 254628)
--- trunk/LayoutTests/loader/change-src-during-iframe-load-crash-expected.txt 2020-01-15 20:18:57 UTC (rev 254627)
+++ trunk/LayoutTests/loader/change-src-during-iframe-load-crash-expected.txt 2020-01-15 20:21:53 UTC (rev 254628)
@@ -1 +0,0 @@
-The test is declared pass if there is no crash observed.
Deleted: trunk/LayoutTests/loader/change-src-during-iframe-load-crash.html (254627 => 254628)
--- trunk/LayoutTests/loader/change-src-during-iframe-load-crash.html 2020-01-15 20:18:57 UTC (rev 254627)
+++ trunk/LayoutTests/loader/change-src-during-iframe-load-crash.html 2020-01-15 20:21:53 UTC (rev 254628)
@@ -1,20 +0,0 @@
-<html>
-<script>
-function load() {
- document.body.innerHTML = 'The test is declared pass if there is no crash observed.';
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-}
-
-function eventhandler3() {
- iframe1.srcdoc = "x";
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-</script>
-<body _onload_="load()">
-<iframe id="iframe1" src=""
-<iframe id="iframe2" _onload_="eventhandler3()" srcdoc="y">
Modified: trunk/Source/WebCore/ChangeLog (254627 => 254628)
--- trunk/Source/WebCore/ChangeLog 2020-01-15 20:18:57 UTC (rev 254627)
+++ trunk/Source/WebCore/ChangeLog 2020-01-15 20:21:53 UTC (rev 254628)
@@ -1,3 +1,18 @@
+2020-01-15 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r254576.
+ https://bugs.webkit.org/show_bug.cgi?id=206306
+
+ Introduced failing test loader/change-src-during-iframe-load-
+ crash.html (Requested by aakashja_ on #webkit).
+
+ Reverted changeset:
+
+ "Null Ptr Deref @
+ WebCore::DocumentLoader::clearMainResourceLoader"
+ https://bugs.webkit.org/show_bug.cgi?id=206204
+ https://trac.webkit.org/changeset/254576
+
2020-01-15 Pinki Gyanchandani <pgyanchand...@apple.com>
Null Ptr Deref @ WebCore::DocumentLoader::clearMainResourceLoader
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (254627 => 254628)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2020-01-15 20:18:57 UTC (rev 254627)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2020-01-15 20:21:53 UTC (rev 254628)
@@ -1272,11 +1272,7 @@
{
m_loadingMainResource = false;
- auto* frameLoader = this->frameLoader();
- if (!frameLoader)
- return;
-
- if (this == frameLoader->activeDocumentLoader())
+ if (this == frameLoader()->activeDocumentLoader())
checkLoadComplete();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
