third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.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/html/HTMLFrameOwnerElement.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: add comment to motivate DEFINE_STATIC_LOCAL_NO_REGISTER() 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/fetch/Resource.cpp ('k') | third_party/WebKit/Source/core/page/Page.cpp » ('j') | third_party/WebKit/Source/web/WebKit.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

index 7692c9c0c9a7fba0788e01aff8adb4d620af7099..1f4e437ee5028a5eccf821532b074126995bfd1c 100644

--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

@@ -42,7 +42,7 @@ namespace blink {

typedef WillBeHeapHashMap<RefPtrWillBeMember<Widget>, RawPtrWillBeMember<FrameView>> WidgetToParentMap;

static WidgetToParentMap& widgetNewParentMap()

{

- DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WidgetToParentMap>, map, (adoptPtrWillBeNoop(new WidgetToParentMap())));

+ DEFINE_STATIC_LOCAL_NO_REGISTER(OwnPtrWillBePersistent<WidgetToParentMap>, map, (adoptPtrWillBeNoop(new WidgetToParentMap())));

return *map;

}

@@ -51,7 +51,7 @@ static WidgetSet& widgetsPendingTemporaryRemovalFromParent()

{

// Widgets in this set will not leak because it will be cleared in

// HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOperations.

- DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WidgetSet>, set, (adoptPtrWillBeNoop(new WidgetSet())));

+ DEFINE_STATIC_LOCAL_NO_REGISTER(OwnPtrWillBePersistent<WidgetSet>, set, (adoptPtrWillBeNoop(new WidgetSet())));

return *set;

}