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

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

Issue 555163005: Deactivate IDBTransactions created within Microtasks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove bogus line, clean up hideous conditional Created 6 years, 3 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
« no previous file with comments | « Source/core/dom/Microtask.h ('k') | Source/core/inspector/AsyncCallStackTracker.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/dom/Microtask.h" 32 #include "core/dom/Microtask.h"
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 "platform/Task.h" 36 #include "platform/Task.h"
36 #include "public/platform/WebThread.h" 37 #include "public/platform/WebThread.h"
37 #include <v8.h> 38 #include <v8.h>
38 39
39 namespace blink { 40 namespace blink {
40 41
41 void Microtask::performCheckpoint() 42 void Microtask::performCheckpoint()
42 { 43 {
43 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 44 v8::Isolate* isolate = v8::Isolate::GetCurrent();
44 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate); 45 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate);
45 ASSERT(isolateData); 46 ASSERT(isolateData);
46 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo int()) 47 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo int() || isolateData->destructionPending())
47 return; 48 return;
48 isolateData->setPerformingMicrotaskCheckpoint(true); 49 isolateData->setPerformingMicrotaskCheckpoint(true);
49 isolate->RunMicrotasks(); 50 {
51 // Ensure that end-of-task-or-microtask actions are performed.
52 V8RecursionScope recursionScope(isolate);
53 isolate->RunMicrotasks();
54 }
50 isolateData->setPerformingMicrotaskCheckpoint(false); 55 isolateData->setPerformingMicrotaskCheckpoint(false);
51 } 56 }
52 57
58 bool Microtask::performingCheckpoint(v8::Isolate* isolate)
59 {
60 return V8PerIsolateData::from(isolate)->performingMicrotaskCheckpoint();
61 }
62
53 static void microtaskFunctionCallback(void* data) 63 static void microtaskFunctionCallback(void* data)
54 { 64 {
55 OwnPtr<WebThread::Task> task = adoptPtr(static_cast<WebThread::Task*>(data)) ; 65 OwnPtr<WebThread::Task> task = adoptPtr(static_cast<WebThread::Task*>(data)) ;
56 task->run(); 66 task->run();
57 } 67 }
58 68
59 void Microtask::enqueueMicrotask(PassOwnPtr<WebThread::Task> callback) 69 void Microtask::enqueueMicrotask(PassOwnPtr<WebThread::Task> callback)
60 { 70 {
61 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 71 v8::Isolate* isolate = v8::Isolate::GetCurrent();
62 isolate->EnqueueMicrotask(&microtaskFunctionCallback, callback.leakPtr()); 72 isolate->EnqueueMicrotask(&microtaskFunctionCallback, callback.leakPtr());
63 } 73 }
64 74
65 void Microtask::enqueueMicrotask(const Closure& callback) 75 void Microtask::enqueueMicrotask(const Closure& callback)
66 { 76 {
67 enqueueMicrotask(adoptPtr(new Task(callback))); 77 enqueueMicrotask(adoptPtr(new Task(callback)));
68 } 78 }
69 79
70 } // namespace blink 80 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Microtask.h ('k') | Source/core/inspector/AsyncCallStackTracker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698