Title: [220838] releases/WebKitGTK/webkit-2.18
- Revision
- 220838
- Author
- [email protected]
- Date
- 2017-08-17 00:19:54 -0700 (Thu, 17 Aug 2017)
Log Message
Merge r220750 - 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: releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog (220837 => 220838)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog 2017-08-17 07:18:32 UTC (rev 220837)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog 2017-08-17 07:19:54 UTC (rev 220838)
@@ -1,3 +1,12 @@
+2017-08-15 Darin Adler <[email protected]>
+
+ 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 <[email protected]>
Unreviewed GTK test gardening
Modified: releases/WebKitGTK/webkit-2.18/LayoutTests/TestExpectations (220837 => 220838)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/TestExpectations 2017-08-17 07:18:32 UTC (rev 220837)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/TestExpectations 2017-08-17 07:19:54 UTC (rev 220838)
@@ -699,7 +699,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: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (220837 => 220838)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-17 07:18:32 UTC (rev 220837)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-17 07:19:54 UTC (rev 220838)
@@ -1,3 +1,13 @@
+2017-08-15 Darin Adler <[email protected]>
+
+ 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-14 Carlos Garcia Campos <[email protected]>
WebDriver: handle click events on option elements
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/loader/FrameLoader.cpp (220837 => 220838)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/loader/FrameLoader.cpp 2017-08-17 07:18:32 UTC (rev 220837)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/loader/FrameLoader.cpp 2017-08-17 07:19:54 UTC (rev 220838)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
