Title: [186677] trunk/Source/WebCore
- Revision
- 186677
- Author
- beid...@apple.com
- Date
- 2015-07-10 08:45:04 -0700 (Fri, 10 Jul 2015)
Log Message
ASSERT restoring from page cache as DocumentLoader reattaches to its Frame.
<rdar://problem/21766282> and https://bugs.webkit.org/show_bug.cgi?id=146786
Reviewed by NOBODY (Fixing obvious boneheaded mistake in r186642)
No new tests (Covered by existing)
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::attachToFrame): Bail if reattaching to the current Frame,
which happens when restoring from the page cache.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (186676 => 186677)
--- trunk/Source/WebCore/ChangeLog 2015-07-10 15:28:22 UTC (rev 186676)
+++ trunk/Source/WebCore/ChangeLog 2015-07-10 15:45:04 UTC (rev 186677)
@@ -1,3 +1,16 @@
+2015-07-10 Brady Eidson <beid...@apple.com>
+
+ ASSERT restoring from page cache as DocumentLoader reattaches to its Frame.
+ <rdar://problem/21766282> and https://bugs.webkit.org/show_bug.cgi?id=146786
+
+ Reviewed by NOBODY (Fixing obvious boneheaded mistake in r186642)
+
+ No new tests (Covered by existing)
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::attachToFrame): Bail if reattaching to the current Frame,
+ which happens when restoring from the page cache.
+
2015-07-09 Zalan Bujtas <za...@apple.com>
Plugin create can end up destroying its renderer.
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (186676 => 186677)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-07-10 15:28:22 UTC (rev 186676)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-07-10 15:45:04 UTC (rev 186677)
@@ -901,6 +901,9 @@
void DocumentLoader::attachToFrame(Frame& frame)
{
+ if (m_frame == &frame)
+ return;
+
ASSERT(!m_frame);
m_frame = &frame;
m_writer.setFrame(&frame);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
