third_party/WebKit/Source/core/dom/TreeScope.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/TreeScope.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/PresentationAttributeStyle.cpp ('k') | third_party/WebKit/Source/core/dom/WeakIdentifierMap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/TreeScope.cpp

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

index 3fde494a82739aed60c1af01f40a55d0071b3c5c..f69be23a01fcd728228219576981f8e393541b3c 100644

--- a/third_party/WebKit/Source/core/dom/TreeScope.cpp

+++ b/third_party/WebKit/Source/core/dom/TreeScope.cpp

@@ -170,11 +170,11 @@

const HeapVector<Member<Element>>& TreeScope::getAllElementsById(const AtomicString& elementId) const

{

- DEFINE_STATIC_LOCAL(HeapVector<Member<Element>>, emptyVector, (new HeapVector<Member<Element>>));

+ DEFINE_STATIC_LOCAL(Persistent<HeapVector<Member<Element>>>, emptyVector, (new HeapVector<Member<Element>>()));

if (elementId.isEmpty())

- return emptyVector;

+ return *emptyVector;

if (!m_elementsById)

- return emptyVector;

+ return *emptyVector;

return m_elementsById->getAllElementsById(elementId, this);

}