Changeset 220750 in webkit

Timestamp:

Aug 15, 2017 11:13:57 AM (7 years ago)

Author:

Darin Adler

Message:

REGRESSION(r220052): http/tests/appcache/deferred-events-delete-while-raising-timer.html is crashing.
​https://bugs.webkit.org/show_bug.cgi?id=175107

Reviewed by Alexey Proskuryakov.

Source/WebCore:

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::checkLoadComplete): Moved the assertion to after the null page check.

LayoutTests:

• TestExpectations: Removed the flakiness expectation for this test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-08-15  Darin Adler  <darin@apple.com>
+
+        REGRESSION(r220052): http/tests/appcache/deferred-events-delete-while-raising-timer.html is crashing.
+        https://bugs.webkit.org/show_bug.cgi?id=175107
+
+        Reviewed by Alexey Proskuryakov.
+
+        * TestExpectations: Removed the flakiness expectation for this test.
+
 2017-08-15  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -706 +706 @@
 webkit.org/b/87633 http/tests/appcache/abort-cache-onchecking-manifest-404.html [ Pass Failure ]
 webkit.org/b/87633 http/tests/appcache/abort-cache-ondownloading-resource-404.html [ Pass Failure ]
-webkit.org/b/175107 http/tests/appcache/deferred-events-delete-while-raising-timer.html [ Pass Failure Crash ]
 webkit.org/b/87633 http/tests/appcache/deferred-events-delete-while-raising.html [ Pass Failure ]
 webkit.org/b/87633 http/tests/appcache/deferred-events.html [ Pass Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-15  Darin Adler  <darin@apple.com>
+
+        REGRESSION(r220052): http/tests/appcache/deferred-events-delete-while-raising-timer.html is crashing.
+        https://bugs.webkit.org/show_bug.cgi?id=175107
+
+        Reviewed by Alexey Proskuryakov.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkLoadComplete): Moved the assertion to after the null page check.
+
 2017-08-15  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2500 +2500 @@
 void FrameLoader::checkLoadComplete()
 {
+    m_shouldCallCheckLoadComplete = false;
+
+    if (!m_frame.page())
+        return;
+
     ASSERT(m_client.hasWebView());
     
-    m_shouldCallCheckLoadComplete = false;
-
-    if (!m_frame.page())
-        return;
-
     // FIXME: Always traversing the entire frame tree is a bit inefficient, but 
     // is currently needed in order to null out the previous history item for all frames.