Title: [220750] trunk
Revision
220750
Author
da...@apple.com
Date
2017-08-15 11:13:57 -0700 (Tue, 15 Aug 2017)

Log 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.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (220749 => 220750)


--- trunk/LayoutTests/ChangeLog	2017-08-15 17:57:56 UTC (rev 220749)
+++ trunk/LayoutTests/ChangeLog	2017-08-15 18:13:57 UTC (rev 220750)
@@ -1,3 +1,12 @@
+2017-08-15  Darin Adler  <da...@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  <mcatanz...@igalia.com>
 
         Unreviewed GTK test gardening

Modified: trunk/LayoutTests/TestExpectations (220749 => 220750)


--- trunk/LayoutTests/TestExpectations	2017-08-15 17:57:56 UTC (rev 220749)
+++ trunk/LayoutTests/TestExpectations	2017-08-15 18:13:57 UTC (rev 220750)
@@ -705,7 +705,6 @@
 # Aborting application cache abort tests are intrinsically flaky.
 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 ]
 

Modified: trunk/Source/WebCore/ChangeLog (220749 => 220750)


--- trunk/Source/WebCore/ChangeLog	2017-08-15 17:57:56 UTC (rev 220749)
+++ trunk/Source/WebCore/ChangeLog	2017-08-15 18:13:57 UTC (rev 220750)
@@ -1,3 +1,13 @@
+2017-08-15  Darin Adler  <da...@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-qu...@webkit.org>
 
         Unreviewed, rolling out r219504.

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (220749 => 220750)


--- trunk/Source/WebCore/loader/FrameLoader.cpp	2017-08-15 17:57:56 UTC (rev 220749)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2017-08-15 18:13:57 UTC (rev 220750)
@@ -2499,13 +2499,13 @@
 // Called every time a resource is completely loaded or an error is received.
 void FrameLoader::checkLoadComplete()
 {
-    ASSERT(m_client.hasWebView());
-    
     m_shouldCallCheckLoadComplete = false;
 
     if (!m_frame.page())
         return;
 
+    ASSERT(m_client.hasWebView());
+    
     // 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.
     Vector<Ref<Frame>, 16> frames;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to