Title: [216253] trunk/Source/WebCore
- Revision
- 216253
- Author
- an...@apple.com
- Date
- 2017-05-05 11:39:30 -0700 (Fri, 05 May 2017)
Log Message
ASSERTION FAILED: !frame().document()->inRenderTreeUpdate() in WebCore::FrameView::layout(bool)
https://bugs.webkit.org/show_bug.cgi?id=171717
Reviewed by Brent Fulgham.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::checkCompleted):
Don't allow frame load to complete in the middle of a render tree update. Instead delay the check.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (216252 => 216253)
--- trunk/Source/WebCore/ChangeLog 2017-05-05 18:22:45 UTC (rev 216252)
+++ trunk/Source/WebCore/ChangeLog 2017-05-05 18:39:30 UTC (rev 216253)
@@ -1,3 +1,15 @@
+2017-05-05 Antti Koivisto <an...@apple.com>
+
+ ASSERTION FAILED: !frame().document()->inRenderTreeUpdate() in WebCore::FrameView::layout(bool)
+ https://bugs.webkit.org/show_bug.cgi?id=171717
+
+ Reviewed by Brent Fulgham.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::checkCompleted):
+
+ Don't allow frame load to complete in the middle of a render tree update. Instead delay the check.
+
2017-05-05 Chris Dumez <cdu...@apple.com>
Refactor / Clean up Element.idl
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (216252 => 216253)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2017-05-05 18:22:45 UTC (rev 216252)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2017-05-05 18:39:30 UTC (rev 216253)
@@ -793,6 +793,13 @@
if (m_isComplete)
return;
+ // FIXME: It would be better if resource loads were kicked off after render tree update (or didn't complete synchronously).
+ // https://bugs.webkit.org/show_bug.cgi?id=171729
+ if (m_frame.document()->inRenderTreeUpdate()) {
+ scheduleCheckCompleted();
+ return;
+ }
+
// Are we still parsing?
if (m_frame.document()->parsing())
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
