Title: [171275] branches/safari-537.78-branch
- Revision
- 171275
- Author
- [email protected]
- Date
- 2014-07-19 17:04:52 -0700 (Sat, 19 Jul 2014)
Log Message
Merged r170946. <rdar://problem/17684656>
Modified Paths
Diff
Modified: branches/safari-537.78-branch/LayoutTests/ChangeLog (171274 => 171275)
--- branches/safari-537.78-branch/LayoutTests/ChangeLog 2014-07-19 23:59:16 UTC (rev 171274)
+++ branches/safari-537.78-branch/LayoutTests/ChangeLog 2014-07-20 00:04:52 UTC (rev 171275)
@@ -1,5 +1,18 @@
2014-07-19 Lucas Forschler <[email protected]>
+ Merge r170946
+
+ 2014-07-08 Jeffrey Pfau <[email protected]>
+
+ Fix flaky loading tests
+ https://bugs.webkit.org/show_bug.cgi?id=133696
+
+ Reviewed by Ryosuke Niwa.
+
+ * platform/wk2/TestExpectations: Unskip no-longer failing tests
+
+2014-07-19 Lucas Forschler <[email protected]>
+
Merge r170135
2014-06-11 Jeffrey Pfau <[email protected]>
Modified: branches/safari-537.78-branch/Source/WebCore/ChangeLog (171274 => 171275)
--- branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-19 23:59:16 UTC (rev 171274)
+++ branches/safari-537.78-branch/Source/WebCore/ChangeLog 2014-07-20 00:04:52 UTC (rev 171275)
@@ -1,5 +1,22 @@
2014-07-19 Lucas Forschler <[email protected]>
+ Merge r170946
+
+ 2014-07-08 Jeffrey Pfau <[email protected]>
+
+ Fix flaky loading tests
+ https://bugs.webkit.org/show_bug.cgi?id=133696
+
+ Reviewed by Ryosuke Niwa.
+
+ In some cases, the Frame may be destroyed while the loader is
+ initializing. Make sure we don't delete it too early.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::init):
+
+2014-07-19 Lucas Forschler <[email protected]>
+
Merge r170135
2014-06-11 Jeffrey Pfau <[email protected]>
Modified: branches/safari-537.78-branch/Source/WebCore/loader/FrameLoader.cpp (171274 => 171275)
--- branches/safari-537.78-branch/Source/WebCore/loader/FrameLoader.cpp 2014-07-19 23:59:16 UTC (rev 171274)
+++ branches/safari-537.78-branch/Source/WebCore/loader/FrameLoader.cpp 2014-07-20 00:04:52 UTC (rev 171275)
@@ -262,6 +262,8 @@
setPolicyDocumentLoader(m_client->createDocumentLoader(ResourceRequest(KURL(ParsedURLString, emptyString())), SubstituteData()).get());
setProvisionalDocumentLoader(m_policyDocumentLoader.get());
m_provisionalDocumentLoader->startLoadingMainResource();
+
+ RefPtr<Frame> protect(m_frame);
m_frame->document()->cancelParsing();
m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
