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

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: Refactored fix 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
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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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/ModuleProxy.h"
34 #include "bindings/core/v8/V8PerIsolateData.h" 35 #include "bindings/core/v8/V8PerIsolateData.h"
36 #include "bindings/core/v8/V8RecursionScope.h"
35 #include "platform/Task.h" 37 #include "platform/Task.h"
36 #include "public/platform/WebThread.h" 38 #include "public/platform/WebThread.h"
37 #include <v8.h> 39 #include <v8.h>
38 40
39 namespace blink { 41 namespace blink {
40 42
41 void Microtask::performCheckpoint() 43 void Microtask::performCheckpoint()
42 { 44 {
43 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 45 v8::Isolate* isolate = v8::Isolate::GetCurrent();
44 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate); 46 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate);
45 ASSERT(isolateData); 47 ASSERT(isolateData);
46 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo int()) 48 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo int() || isolateData->destructionPending())
47 return; 49 return;
48 isolateData->setPerformingMicrotaskCheckpoint(true); 50 isolateData->setPerformingMicrotaskCheckpoint(true);
49 isolate->RunMicrotasks(); 51 {
52 // Ensure that end-of-task-or-microtask actions are performed.
53 V8RecursionScope recursionScope(isolate);
54 isolate->RunMicrotasks();
55 ModuleProxy::moduleProxy().didLeaveScriptContextForRecursionScope(isolat e);
adamk 2014/09/22 18:30:57 I'm not familiar with this thing. Can you explain
jsbell 2014/09/22 18:49:51 Whoops, that's accidentally left in from an earlie
56 }
50 isolateData->setPerformingMicrotaskCheckpoint(false); 57 isolateData->setPerformingMicrotaskCheckpoint(false);
51 } 58 }
52 59
60 bool Microtask::performingCheckpoint(v8::Isolate* isolate)
61 {
62 return V8PerIsolateData::from(isolate)->performingMicrotaskCheckpoint();
63 }
64
53 static void microtaskFunctionCallback(void* data) 65 static void microtaskFunctionCallback(void* data)
54 { 66 {
55 OwnPtr<WebThread::Task> task = adoptPtr(static_cast<WebThread::Task*>(data)) ; 67 OwnPtr<WebThread::Task> task = adoptPtr(static_cast<WebThread::Task*>(data)) ;
56 task->run(); 68 task->run();
57 } 69 }
58 70
59 void Microtask::enqueueMicrotask(PassOwnPtr<WebThread::Task> callback) 71 void Microtask::enqueueMicrotask(PassOwnPtr<WebThread::Task> callback)
60 { 72 {
61 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 73 v8::Isolate* isolate = v8::Isolate::GetCurrent();
62 isolate->EnqueueMicrotask(&microtaskFunctionCallback, callback.leakPtr()); 74 isolate->EnqueueMicrotask(&microtaskFunctionCallback, callback.leakPtr());
63 } 75 }
64 76
65 void Microtask::enqueueMicrotask(const Closure& callback) 77 void Microtask::enqueueMicrotask(const Closure& callback)
66 { 78 {
67 enqueueMicrotask(adoptPtr(new Task(callback))); 79 enqueueMicrotask(adoptPtr(new Task(callback)));
68 } 80 }
69 81
70 } // namespace blink 82 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698