Title: [170946] trunk
- Revision
- 170946
- Author
- jp...@apple.com
- Date
- 2014-07-09 18:13:45 -0700 (Wed, 09 Jul 2014)
Log Message
Fix flaky loading tests
https://bugs.webkit.org/show_bug.cgi?id=133696
Reviewed by Ryosuke Niwa.
Source/WebCore:
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):
LayoutTests:
* platform/wk2/TestExpectations: Unskip no-longer failing tests
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (170945 => 170946)
--- trunk/LayoutTests/ChangeLog 2014-07-10 01:05:23 UTC (rev 170945)
+++ trunk/LayoutTests/ChangeLog 2014-07-10 01:13:45 UTC (rev 170946)
@@ -1,3 +1,12 @@
+2014-07-08 Jeffrey Pfau <jp...@apple.com>
+
+ 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-09 Hunseop Jeong <hs85.je...@samsung.com>
[EFL] gardening after r170868
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (170945 => 170946)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2014-07-10 01:05:23 UTC (rev 170945)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2014-07-10 01:13:45 UTC (rev 170946)
@@ -240,10 +240,6 @@
webkit.org/b/132297 svg/custom/bug79798.html [ Skip ]
-webkit.org/b/133696 fast/frames/iframe-onload-remove-self-no-crash.html [ Skip ]
-webkit.org/b/133696 fast/loader/create-frame-in-DOMContentLoaded.html [ Skip ]
-webkit.org/b/133696 fast/loader/frame-creation-removal.html [ Skip ]
-
### END OF (1) Classified failures with bug reports
########################################
Modified: trunk/Source/WebCore/ChangeLog (170945 => 170946)
--- trunk/Source/WebCore/ChangeLog 2014-07-10 01:05:23 UTC (rev 170945)
+++ trunk/Source/WebCore/ChangeLog 2014-07-10 01:13:45 UTC (rev 170946)
@@ -1,3 +1,16 @@
+2014-07-08 Jeffrey Pfau <jp...@apple.com>
+
+ 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-09 Simon Fraser <simon.fra...@apple.com>
Make IndirectCompositingReason an enum class
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (170945 => 170946)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-07-10 01:05:23 UTC (rev 170945)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-07-10 01:13:45 UTC (rev 170946)
@@ -268,6 +268,8 @@
setPolicyDocumentLoader(m_client.createDocumentLoader(ResourceRequest(URL(ParsedURLString, emptyString())), SubstituteData()).get());
setProvisionalDocumentLoader(m_policyDocumentLoader.get());
m_provisionalDocumentLoader->startLoadingMainResource();
+
+ Ref<Frame> protect(m_frame);
m_frame.document()->cancelParsing();
m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
