Title: [212403] branches/safari-603-branch/Source/WebCore
- Revision
- 212403
- Author
- ryanhad...@apple.com
- Date
- 2017-02-15 15:32:35 -0800 (Wed, 15 Feb 2017)
Log Message
Merge r212238. rdar://problem/30494165
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212402 => 212403)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-15 23:29:49 UTC (rev 212402)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-15 23:32:35 UTC (rev 212403)
@@ -1,3 +1,24 @@
+2017-02-15 Ryan Haddad <ryanhad...@apple.com>
+
+ Merge r212238. rdar://problem/30494165
+
+ 2017-02-13 Chris Dumez <cdu...@apple.com>
+
+ Regression(r211455): ASSERTION FAILED: frameView || pageCacheState() == InPageCache in com.apple.WebCore: WebCore::Document::destroyRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=168237
+ <rdar://problem/30494165>
+
+ Reviewed by Gavin Barraclough.
+
+ Drop bad assertion under document::destroyRenderTree() that was introduced in r211455.
+ The assertion seemed like a good idea but the issue is that CachedFrame::destroy()
+ reset's the document's pageCacheState before calling Document::prepareForDestruction().
+
+ No new tests, this fixes assertion hits on our bots.
+
+ * dom/Document.cpp:
+ (WebCore::Document::destroyRenderTree):
+
2017-02-10 Matthew Hanson <matthew_han...@apple.com>
Merge r212131. rdar://problem/30271744
Modified: branches/safari-603-branch/Source/WebCore/dom/Document.cpp (212402 => 212403)
--- branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-02-15 23:29:49 UTC (rev 212402)
+++ branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-02-15 23:32:35 UTC (rev 212403)
@@ -2240,7 +2240,6 @@
ASSERT(m_pageCacheState != InPageCache);
FrameView* frameView = frame()->document() == this ? frame()->view() : nullptr;
- ASSERT(frameView || pageCacheState() == InPageCache);
SetForScope<bool> change(m_renderTreeBeingDestroyed, true);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
