Title: [213521] trunk/Source/WebCore
- Revision
- 213521
- Author
- [email protected]
- Date
- 2017-03-07 09:22:35 -0800 (Tue, 07 Mar 2017)
Log Message
Replace debug assertion with release one in Frame::setView()
https://bugs.webkit.org/show_bug.cgi?id=169189
Reviewed by Ryosuke Niwa.
Replace debug assertion with release one in Frame::setView() to make make sure the
document does not have a living render tree. This will help identify possible
remaining cases where this can happen.
* dom/Document.cpp:
(WebCore::Document::didBecomeCurrentDocumentInView): Deleted.
* dom/Document.h:
* page/Frame.cpp:
(WebCore::Frame::setView):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (213520 => 213521)
--- trunk/Source/WebCore/ChangeLog 2017-03-07 17:15:06 UTC (rev 213520)
+++ trunk/Source/WebCore/ChangeLog 2017-03-07 17:22:35 UTC (rev 213521)
@@ -1,3 +1,20 @@
+2017-03-07 Chris Dumez <[email protected]>
+
+ Replace debug assertion with release one in Frame::setView()
+ https://bugs.webkit.org/show_bug.cgi?id=169189
+
+ Reviewed by Ryosuke Niwa.
+
+ Replace debug assertion with release one in Frame::setView() to make make sure the
+ document does not have a living render tree. This will help identify possible
+ remaining cases where this can happen.
+
+ * dom/Document.cpp:
+ (WebCore::Document::didBecomeCurrentDocumentInView): Deleted.
+ * dom/Document.h:
+ * page/Frame.cpp:
+ (WebCore::Frame::setView):
+
2017-03-07 Youenn Fablet <[email protected]>
Expose WebRTC current/pending description getters
Modified: trunk/Source/WebCore/dom/Document.cpp (213520 => 213521)
--- trunk/Source/WebCore/dom/Document.cpp 2017-03-07 17:15:06 UTC (rev 213520)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-03-07 17:22:35 UTC (rev 213521)
@@ -2195,13 +2195,6 @@
FrameDestructionObserver::frameDestroyed();
}
-void Document::didBecomeCurrentDocumentInView()
-{
- ASSERT(view());
- if (!hasLivingRenderTree())
- createRenderTree();
-}
-
void Document::attachToCachedFrame(CachedFrameBase& cachedFrame)
{
ASSERT_WITH_SECURITY_IMPLICATION(cachedFrame.document() == this);
Modified: trunk/Source/WebCore/dom/Document.h (213520 => 213521)
--- trunk/Source/WebCore/dom/Document.h 2017-03-07 17:15:06 UTC (rev 213520)
+++ trunk/Source/WebCore/dom/Document.h 2017-03-07 17:22:35 UTC (rev 213521)
@@ -553,7 +553,6 @@
void didBecomeCurrentDocumentInFrame();
void destroyRenderTree();
void prepareForDestruction();
- void didBecomeCurrentDocumentInView();
// Override ScriptExecutionContext methods to do additional work
bool shouldBypassMainWorldContentSecurityPolicy() const final;
Modified: trunk/Source/WebCore/page/Frame.cpp (213520 => 213521)
--- trunk/Source/WebCore/page/Frame.cpp 2017-03-07 17:15:06 UTC (rev 213520)
+++ trunk/Source/WebCore/page/Frame.cpp 2017-03-07 17:22:35 UTC (rev 213521)
@@ -255,16 +255,9 @@
if (m_eventHandler)
m_eventHandler->clear();
- bool hadLivingRenderTree = m_doc ? m_doc->hasLivingRenderTree() : false;
- // Try and catch cases where this might still be happening after r213311.
- ASSERT_WITH_SECURITY_IMPLICATION(!hadLivingRenderTree);
- if (hadLivingRenderTree)
- m_doc->destroyRenderTree();
+ RELEASE_ASSERT(!m_doc || !m_doc->hasLivingRenderTree());
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
