Title: [258581] branches/safari-609-branch/Source/WebCore
- Revision
- 258581
- Author
- [email protected]
- Date
- 2020-03-17 13:39:14 -0700 (Tue, 17 Mar 2020)
Log Message
Cherry-pick r258267. rdar://problem/60539190
Consolidate detachment of document timeline into Document::commonTeardown.
https://bugs.webkit.org/show_bug.cgi?id=208786
<rdar://problem/59936716>
Patch by Jack Lee <[email protected]> on 2020-03-11
Reviewed by Ryosuke Niwa.
Move detachment of DocumentTimeline to Document::commonTeardown().
No new tests. Covered by existing document tests.
* dom/Document.cpp:
(WebCore::Document::removedLastRef):
(WebCore::Document::commonTeardown):
(WebCore::Document::prepareForDestruction):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258267 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebCore/ChangeLog (258580 => 258581)
--- branches/safari-609-branch/Source/WebCore/ChangeLog 2020-03-17 20:39:11 UTC (rev 258580)
+++ branches/safari-609-branch/Source/WebCore/ChangeLog 2020-03-17 20:39:14 UTC (rev 258581)
@@ -1,5 +1,44 @@
2020-03-17 Alan Coon <[email protected]>
+ Cherry-pick r258267. rdar://problem/60539190
+
+ Consolidate detachment of document timeline into Document::commonTeardown.
+ https://bugs.webkit.org/show_bug.cgi?id=208786
+ <rdar://problem/59936716>
+
+ Patch by Jack Lee <[email protected]> on 2020-03-11
+ Reviewed by Ryosuke Niwa.
+
+ Move detachment of DocumentTimeline to Document::commonTeardown().
+
+ No new tests. Covered by existing document tests.
+
+ * dom/Document.cpp:
+ (WebCore::Document::removedLastRef):
+ (WebCore::Document::commonTeardown):
+ (WebCore::Document::prepareForDestruction):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258267 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-03-11 Jack Lee <[email protected]>
+
+ Consolidate detachment of document timeline into Document::commonTeardown.
+ https://bugs.webkit.org/show_bug.cgi?id=208786
+ <rdar://problem/59936716>
+
+ Reviewed by Ryosuke Niwa.
+
+ Move detachment of DocumentTimeline to Document::commonTeardown().
+
+ No new tests. Covered by existing document tests.
+
+ * dom/Document.cpp:
+ (WebCore::Document::removedLastRef):
+ (WebCore::Document::commonTeardown):
+ (WebCore::Document::prepareForDestruction):
+
+2020-03-17 Alan Coon <[email protected]>
+
Cherry-pick r255997. rdar://problem/60495055
Incorrect TextTrack sorting with invalid BCP47 language
Modified: branches/safari-609-branch/Source/WebCore/dom/Document.cpp (258580 => 258581)
--- branches/safari-609-branch/Source/WebCore/dom/Document.cpp 2020-03-17 20:39:11 UTC (rev 258580)
+++ branches/safari-609-branch/Source/WebCore/dom/Document.cpp 2020-03-17 20:39:14 UTC (rev 258581)
@@ -757,7 +757,7 @@
#endif
decrementReferencingNodeCount();
} else {
- stopActiveDOMObjects();
+ commonTeardown();
#ifndef NDEBUG
m_inRemovedLastRefFunction = false;
m_deletionHasBegun = true;
@@ -783,6 +783,10 @@
m_highlightMap->clear();
m_pendingScrollEventTargetList = nullptr;
+
+ while (!m_timelines.computesEmpty())
+ m_timelines.begin()->detachFromDocument();
+ m_timeline = nullptr;
}
Element* Document::elementForAccessKey(const String& key)
@@ -2577,10 +2581,6 @@
detachFromFrame();
- while (!m_timelines.computesEmpty())
- m_timelines.begin()->detachFromDocument();
- m_timeline = nullptr;
-
#if ENABLE(CSS_PAINTING_API)
for (auto& scope : m_paintWorkletGlobalScopes.values())
scope->prepareForDestruction();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
