Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: Source/core/dom/Microtask.cpp

Issue 1161823002: Correctly keep track of isolates for microtask execution (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 22 matching lines...) Expand all
33 33
34 #include "bindings/core/v8/V8PerIsolateData.h" 34 #include "bindings/core/v8/V8PerIsolateData.h"
35 #include "bindings/core/v8/V8RecursionScope.h" 35 #include "bindings/core/v8/V8RecursionScope.h"
36 #include "platform/ScriptForbiddenScope.h" 36 #include "platform/ScriptForbiddenScope.h"
37 #include "platform/Task.h" 37 #include "platform/Task.h"
38 #include "public/platform/WebThread.h" 38 #include "public/platform/WebThread.h"
39 #include <v8.h> 39 #include <v8.h>
40 40
41 namespace blink { 41 namespace blink {
42 42
43 void Microtask::performCheckpoint() 43 void Microtask::performCheckpoint(v8::Isolate* isolate)
44 { 44 {
45 v8::Isolate* isolate = v8::Isolate::GetCurrent();
46 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate); 45 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate);
47 ASSERT(isolateData); 46 ASSERT(isolateData);
48 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo int() || isolateData->destructionPending() || ScriptForbiddenScope::isScriptForb idden()) 47 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo int() || isolateData->destructionPending() || ScriptForbiddenScope::isScriptForb idden())
49 return; 48 return;
50 isolateData->setPerformingMicrotaskCheckpoint(true); 49 isolateData->setPerformingMicrotaskCheckpoint(true);
51 { 50 {
52 // Ensure that end-of-task-or-microtask actions are performed. 51 // Ensure that end-of-task-or-microtask actions are performed.
53 V8RecursionScope recursionScope(isolate); 52 V8RecursionScope recursionScope(isolate);
54 isolate->RunMicrotasks(); 53 isolate->RunMicrotasks();
55 } 54 }
(...skipping 16 matching lines...) Expand all
72 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 71 v8::Isolate* isolate = v8::Isolate::GetCurrent();
73 isolate->EnqueueMicrotask(&microtaskFunctionCallback, callback.leakPtr()); 72 isolate->EnqueueMicrotask(&microtaskFunctionCallback, callback.leakPtr());
74 } 73 }
75 74
76 void Microtask::enqueueMicrotask(PassOwnPtr<Closure> callback) 75 void Microtask::enqueueMicrotask(PassOwnPtr<Closure> callback)
77 { 76 {
78 enqueueMicrotask(adoptPtr(new Task(callback))); 77 enqueueMicrotask(adoptPtr(new Task(callback)));
79 } 78 }
80 79
81 } // namespace blink 80 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698