Unreviewed, rolling out r254576.
authoraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 Jan 2020 20:21:53 +0000 (20:21 +0000)
committeraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 Jan 2020 20:21:53 +0000 (20:21 +0000)
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-queue@webkit.org> on 2020-01-15

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254628 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/http/tests/security/http-0.9/xhr-blocked-expected.txt
LayoutTests/loader/change-src-during-iframe-load-crash-expected.txt [deleted file]
LayoutTests/loader/change-src-during-iframe-load-crash.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/loader/DocumentLoader.cpp

index 7cecc99..5f11892 100644 (file)
@@ -1,3 +1,18 @@
+2020-01-15  Commit Queue  <commit-queue@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  <tsavell@apple.com>
 
         REGRESSION: [ Mac wk2 ] tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler.html is a flaky failure on Mac wk2
diff --git a/LayoutTests/loader/change-src-during-iframe-load-crash-expected.txt b/LayoutTests/loader/change-src-during-iframe-load-crash-expected.txt
deleted file mode 100644 (file)
index 74baf84..0000000
+++ /dev/null
@@ -1 +0,0 @@
-The test is declared pass if there is no crash observed.
diff --git a/LayoutTests/loader/change-src-during-iframe-load-crash.html b/LayoutTests/loader/change-src-during-iframe-load-crash.html
deleted file mode 100644 (file)
index b8d675f..0000000
+++ /dev/null
@@ -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="data:text/html,foo">a</iframe>
-<iframe id="iframe2" onload="eventhandler3()" srcdoc="y">
index bc14c28..30a144f 100644 (file)
@@ -1,3 +1,18 @@
+2020-01-15  Commit Queue  <commit-queue@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  <pgyanchandani@apple.com>
 
         Null Ptr Deref @ WebCore::DocumentLoader::clearMainResourceLoader
index 674d1fb..be27ef1 100644 (file)
@@ -1272,11 +1272,7 @@ void DocumentLoader::clearMainResourceLoader()
 {
     m_loadingMainResource = false;
 
-    auto* frameLoader = this->frameLoader();
-    if (!frameLoader)
-        return;
-
-    if (this == frameLoader->activeDocumentLoader())
+    if (this == frameLoader()->activeDocumentLoader())
         checkLoadComplete();
 }