third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp - Issue 1855203002: Revert of Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp

Issue 1855203002: Revert of Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/dom/custom/CustomElementScheduler.cpp ('k') | third_party/WebKit/Source/core/editing/EditingStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp

diff --git a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp

index 23da88b7e2b4204554ad63de20504d8a1bede3b6..11b24f03f5c53bb9a366de12cd434bde157e3d1e 100644

--- a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp

+++ b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp

@@ -297,7 +297,7 @@

const HeapVector<Member<InsertionPoint>>& ShadowRoot::descendantInsertionPoints()

{

- DEFINE_STATIC_LOCAL(HeapVector<Member<InsertionPoint>>, emptyList, (new HeapVector<Member<InsertionPoint>>));

+ DEFINE_STATIC_LOCAL(PersistentHeapVector<Member<InsertionPoint>>, emptyList, ());

if (m_shadowRootRareData && m_descendantInsertionPointsIsValid)

return m_shadowRootRareData->descendantInsertionPoints();

@@ -349,7 +349,7 @@

const HeapVector<Member<HTMLSlotElement>>& ShadowRoot::descendantSlots()

{

- DEFINE_STATIC_LOCAL(HeapVector<Member<HTMLSlotElement>>, emptyList, (new HeapVector<Member<HTMLSlotElement>>));

+ DEFINE_STATIC_LOCAL(PersistentHeapVector<Member<HTMLSlotElement>>, emptyList, ());

if (m_descendantSlotsIsValid) {

ASSERT(m_shadowRootRareData);

return m_shadowRootRareData->descendantSlots();