Title: [201948] branches/safari-601.1.46-branch/LayoutTests
- Revision
- 201948
- Author
- [email protected]
- Date
- 2016-06-10 16:00:09 -0700 (Fri, 10 Jun 2016)
Log Message
Merge r201287. rdar://problem/26605164
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (201947 => 201948)
--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-06-10 22:55:01 UTC (rev 201947)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-06-10 23:00:09 UTC (rev 201948)
@@ -1,3 +1,16 @@
+2016-06-10 Matthew Hanson <[email protected]>
+
+ Merge r201287. rdar://problem/26605164
+
+ 2016-05-23 Ryan Haddad <[email protected]>
+
+ Marking fast/frames/crash-during-iframe-load-stop.html as a flaky timeout
+ https://bugs.webkit.org/show_bug.cgi?id=157849
+
+ Unreviewed test gardening.
+
+ * TestExpectations:
+
2016-05-16 Babak Shafiei <[email protected]>
Merge r200986.
Modified: branches/safari-601.1.46-branch/LayoutTests/TestExpectations (201947 => 201948)
--- branches/safari-601.1.46-branch/LayoutTests/TestExpectations 2016-06-10 22:55:01 UTC (rev 201947)
+++ branches/safari-601.1.46-branch/LayoutTests/TestExpectations 2016-06-10 23:00:09 UTC (rev 201948)
@@ -579,4 +579,5 @@
loader/stateobjects/pushstate-size-iframe.html [ Slow ]
loader/stateobjects/pushstate-size.html [ Slow ]
loader/stateobjects/replacestate-size-iframe.html [ Slow ]
-loader/stateobjects/replacestate-size.html [ Slow ]
\ No newline at end of file
+loader/stateobjects/replacestate-size.html [ Slow ]
+webkit.org/b/157849 fast/frames/crash-during-iframe-load-stop.html [ Pass Timeout ]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
