third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp - Issue 1477023003: Refactor the Heap into ThreadHeap to prepare for per thread heaps

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/FrameRequestCallbackCollection.cpp

Issue 1477023003: Refactor the Heap into ThreadHeap to prepare for per thread heaps Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

« third_party/WebKit/Source/core/dom/CompositorProxy.cpp ('K') | « third_party/WebKit/Source/core/dom/CompositorProxy.cpp ('k') | third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp » ('j') | third_party/WebKit/Source/core/workers/SharedWorkerThread.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f9e64696d88eabc642ffd84a452930ddfaf6d860..37de8e415021384990de1b5f85d605cc797eb880 100644

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

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

@@ -13,10 +13,14 @@ namespace blink {

FrameRequestCallbackCollection::FrameRequestCallbackCollection(ExecutionContext* context)

: m_context(context)

{

+#if ENABLE(OILPAN)

+ ASSERT(ThreadState::forObject(m_context.get()) == ThreadState::current());

+#endif

}

FrameRequestCallbackCollection::CallbackId FrameRequestCallbackCollection::registerCallback(FrameRequestCallback* callback)

{

+ ASSERT(ThreadState::forObject(callback) == ThreadState::current());

haraken 2016/01/07 08:06:21 Is this useful?

FrameRequestCallbackCollection::CallbackId id = ++m_nextCallbackId;

callback->m_cancelled = false;

callback->m_id = id;