third_party/WebKit/Source/platform/heap/Heap.cpp - Issue 1502093002: Improve ScriptForbiddenScope handling in cross-threaded code.

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/platform/heap/Heap.cpp

Issue 1502093002: Improve ScriptForbiddenScope handling in cross-threaded code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove unnecessary include 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

« third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp ('K') | « third_party/WebKit/Source/platform/ScriptForbiddenScope.cpp ('k') | third_party/WebKit/Source/platform/heap/HeapPage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/heap/Heap.cpp

diff --git a/third_party/WebKit/Source/platform/heap/Heap.cpp b/third_party/WebKit/Source/platform/heap/Heap.cpp

index fd2b765e5fb3dccf9ab3f7b998422668810d292d..39e97da142fd36bf68952100002d9a9fb418c703 100644

--- a/third_party/WebKit/Source/platform/heap/Heap.cpp

+++ b/third_party/WebKit/Source/platform/heap/Heap.cpp

@@ -397,9 +397,7 @@ void Heap::collectGarbage(BlinkGC::StackState stackState, BlinkGC::GCType gcType

// Resume all parked threads upon leaving this scope.

ResumeThreadScope resumeThreads(gcType);

- if (state->isMainThread())

- ScriptForbiddenScope::enter();

+ ScriptForbiddenIfMainThreadScope scriptForbidden;

TRACE_EVENT2("blink_gc", "Heap::collectGarbage",

"lazySweeping", gcType == BlinkGC::GCWithoutSweep,

@@ -462,9 +460,6 @@ void Heap::collectGarbage(BlinkGC::StackState stackState, BlinkGC::GCType gcType

s_gcGeneration = 1;

}

#endif

- if (state->isMainThread())

- ScriptForbiddenScope::exit();

}

void Heap::collectGarbageForTerminatingThread(ThreadState* state)