Title: [171274] branches/safari-537.78-branch
- Revision
- 171274
- Author
- [email protected]
- Date
- 2014-07-19 16:59:16 -0700 (Sat, 19 Jul 2014)
Log Message
Merged r170135. <rdar://problem/17684651>
Modified Paths
Diff
Modified: branches/safari-537.78-branch/LayoutTests/ChangeLog (171273 => 171274)
--- branches/safari-537.78-branch/LayoutTests/ChangeLog 2014-07-19 23:31:14 UTC (rev 171273)
+++ branches/safari-537.78-branch/LayoutTests/ChangeLog 2014-07-19 23:59:16 UTC (rev 171274)
@@ -1,5 +1,18 @@
2014-07-19 Lucas Forschler <[email protected]>
+ Merge r170135
+
+ 2014-06-11 Jeffrey Pfau <[email protected]>
+
+ Fix flaky beforeload tests
+ https://bugs.webkit.org/show_bug.cgi?id=133685
+
+ Reviewed by David Kilzer.
+
+ * platform/wk2/TestExpectations: Unskip tests that are no longer flaky
+
+2014-07-19 Lucas Forschler <[email protected]>
+
Merge r169849
2014-06-11 David Kilzer <[email protected]>
Modified: branches/safari-537.78-branch/Source/WebCore/ChangeLog (171273 => 171274)
--- branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-19 23:31:14 UTC (rev 171273)
+++ branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-19 23:59:16 UTC (rev 171274)
@@ -1,5 +1,19 @@
2014-07-19 Lucas Forschler <[email protected]>
+ Merge r170135
+
+ 2014-06-11 Jeffrey Pfau <[email protected]>
+
+ Fix flaky beforeload tests
+ https://bugs.webkit.org/show_bug.cgi?id=133685
+
+ Reviewed by David Kilzer.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadURL):
+
+2014-07-19 Lucas Forschler <[email protected]>
+
Merge r170513
2014-06-26 David Kilzer <[email protected]>
Modified: branches/safari-537.78-branch/Source/WebCore/loader/FrameLoader.cpp (171273 => 171274)
--- branches/safari-537.78-branch/Source/WebCore/loader/FrameLoader.cpp 2014-07-19 23:31:14 UTC (rev 171273)
+++ branches/safari-537.78-branch/Source/WebCore/loader/FrameLoader.cpp 2014-07-19 23:59:16 UTC (rev 171274)
@@ -1199,6 +1199,8 @@
if (m_inStopAllLoaders)
return;
+ RefPtr<Frame> protect(m_frame);
+
RefPtr<FormState> formState = prpFormState;
bool isFormSubmission = formState;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
