Title: [213296] branches/safari-603.1.30.0-branch/Source/WebCore
- Revision
- 213296
- Author
- matthew_han...@apple.com
- Date
- 2017-03-02 12:49:35 -0800 (Thu, 02 Mar 2017)
Log Message
Roll out r212554 via r212886. rdar://problem/30812601
Modified Paths
Diff
Modified: branches/safari-603.1.30.0-branch/Source/WebCore/ChangeLog (213295 => 213296)
--- branches/safari-603.1.30.0-branch/Source/WebCore/ChangeLog 2017-03-02 20:35:37 UTC (rev 213295)
+++ branches/safari-603.1.30.0-branch/Source/WebCore/ChangeLog 2017-03-02 20:49:35 UTC (rev 213296)
@@ -1,3 +1,7 @@
+2017-03-02 Matthew Hanson <matthew_han...@apple.com>
+
+ Rollout r212886. rdar://problem/30812601
+
2017-02-27 Matthew Hanson <matthew_han...@apple.com>
Merge r213010. rdar://problem/30704432
Modified: branches/safari-603.1.30.0-branch/Source/WebCore/dom/Document.cpp (213295 => 213296)
--- branches/safari-603.1.30.0-branch/Source/WebCore/dom/Document.cpp 2017-03-02 20:35:37 UTC (rev 213295)
+++ branches/safari-603.1.30.0-branch/Source/WebCore/dom/Document.cpp 2017-03-02 20:49:35 UTC (rev 213296)
@@ -2234,16 +2234,10 @@
FrameDestructionObserver::frameDestroyed();
}
-void Document::didBecomeCurrentDocumentInView()
-{
- ASSERT(view());
- if (!hasLivingRenderTree())
- createRenderTree();
-}
-
void Document::destroyRenderTree()
{
ASSERT(hasLivingRenderTree());
+ ASSERT(m_pageCacheState != InPageCache);
FrameView* frameView = frame()->document() == this ? frame()->view() : nullptr;
Modified: branches/safari-603.1.30.0-branch/Source/WebCore/dom/Document.h (213295 => 213296)
--- branches/safari-603.1.30.0-branch/Source/WebCore/dom/Document.h 2017-03-02 20:35:37 UTC (rev 213295)
+++ branches/safari-603.1.30.0-branch/Source/WebCore/dom/Document.h 2017-03-02 20:49:35 UTC (rev 213296)
@@ -566,7 +566,6 @@
void destroyRenderTree();
void disconnectFromFrame();
void prepareForDestruction();
- void didBecomeCurrentDocumentInView();
// Override ScriptExecutionContext methods to do additional work
bool shouldBypassMainWorldContentSecurityPolicy() const final;
Modified: branches/safari-603.1.30.0-branch/Source/WebCore/page/Frame.cpp (213295 => 213296)
--- branches/safari-603.1.30.0-branch/Source/WebCore/page/Frame.cpp 2017-03-02 20:35:37 UTC (rev 213295)
+++ branches/safari-603.1.30.0-branch/Source/WebCore/page/Frame.cpp 2017-03-02 20:49:35 UTC (rev 213296)
@@ -256,15 +256,8 @@
if (m_eventHandler)
m_eventHandler->clear();
- bool hadLivingRenderTree = m_doc ? m_doc->hasLivingRenderTree() : false;
- if (hadLivingRenderTree)
- m_doc->destroyRenderTree();
-
m_view = WTFMove(view);
- if (hadLivingRenderTree && m_view)
- m_doc->didBecomeCurrentDocumentInView();
-
// Only one form submission is allowed per view of a part.
// Since this part may be getting reused as a result of being
// pulled from the back/forward cache, reset this flag.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
