third_party/WebKit/Source/core/fetch/Resource.cpp - Issue 1491253004: Release Oilpan heap singletons prior to LSan leak detection.

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/fetch/Resource.cpp

Issue 1491253004: Release Oilpan heap singletons prior to LSan leak detection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address non-LSan Oilpan compilation failure Created 5 years 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/css/CSSPrimitiveValue.cpp ('k') | third_party/WebKit/Source/core/html/forms/EmailInputType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/Resource.cpp

diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp

index 368115033a61d62a55f36cd99abab659a685076d..2898d9ecb29f0bd6a06055933ab2e551b9335be5 100644

--- a/third_party/WebKit/Source/core/fetch/Resource.cpp

+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp

@@ -997,6 +997,12 @@ ResourcePriority Resource::priorityFromClients()

Resource::ResourceCallback* Resource::ResourceCallback::callbackHandler()

{

+ // Oilpan + LSan: as the callbackHandler() singleton is used by Resource

+ // and ResourcePtr finalizers, it cannot be released upon shutdown in

+ // preparation for leak detection.

+ //

+ // Keep it out of LSan's reach instead.

+ LEAK_SANITIZER_DISABLED_SCOPE;

DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ResourceCallback>, callbackHandler, (adoptPtrWillBeNoop(new ResourceCallback)));

return callbackHandler.get();

}