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

Side by Side Diff: sky/engine/core/dom/Microtask.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « sky/engine/core/dom/ExecutionContext.cpp ('k') | sky/engine/core/dom/MutationObserver.h » ('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 "sky/engine/config.h" 31 #include "sky/engine/config.h"
32 #include "sky/engine/core/dom/Microtask.h" 32 #include "sky/engine/core/dom/Microtask.h"
33 33
34 #include "base/bind.h" 34 #include "base/bind.h"
35 #include "sky/engine/bindings/core/v8/V8PerIsolateData.h"
36 #include "sky/engine/platform/TraceEvent.h" 35 #include "sky/engine/platform/TraceEvent.h"
37 #include "sky/engine/public/platform/WebThread.h" 36 #include "sky/engine/public/platform/WebThread.h"
38 #include "v8/include/v8.h" 37 #include "sky/engine/wtf/OwnPtr.h"
38 #include "sky/engine/wtf/Vector.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
42 namespace { 42 namespace {
43 43
44 class Task : public WebThread::Task { 44 class Task : public WebThread::Task {
45 public: 45 public:
46 explicit Task(const base::Closure& closure) 46 explicit Task(const base::Closure& closure)
47 : m_closure(closure) 47 : m_closure(closure)
48 { 48 {
49 } 49 }
50 50
51 virtual void run() override 51 virtual void run() override
52 { 52 {
53 m_closure.Run(); 53 m_closure.Run();
54 } 54 }
55 55
56 private: 56 private:
57 base::Closure m_closure; 57 base::Closure m_closure;
58 }; 58 };
59 59
60 } 60 }
61 61
62 // TODO(dart): Integrate this microtask queue with darts.
63 typedef Vector<OwnPtr<WebThread::Task> > MicrotaskQueue;
64 static MicrotaskQueue& microtaskQueue()
65 {
66 DEFINE_STATIC_LOCAL(OwnPtr<MicrotaskQueue>, queue, (adoptPtr(new MicrotaskQu eue())));
67 return *queue;
68 }
69
62 void Microtask::performCheckpoint() 70 void Microtask::performCheckpoint()
63 { 71 {
64 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 72 MicrotaskQueue& queue = microtaskQueue();
65 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate); 73 while(!queue.isEmpty()) {
66 ASSERT(isolateData); 74 MicrotaskQueue local;
67 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo int()) 75 swap(queue, local);
68 return; 76 for (const auto& task : local)
69 TRACE_EVENT0("v8", "v8.runMicrotasks"); 77 task->run();
70 isolateData->setPerformingMicrotaskCheckpoint(true); 78 }
71 isolate->RunMicrotasks();
72 isolateData->setPerformingMicrotaskCheckpoint(false);
73 } 79 }
74 80
75 static void microtaskFunctionCallback(void* data) 81 // static void microtaskFunctionCallback(void* data)
76 { 82 // {
77 OwnPtr<WebThread::Task> task = adoptPtr(static_cast<WebThread::Task*>(data)) ; 83 // OwnPtr<WebThread::Task> task = adoptPtr(static_cast<WebThread::Task*>(dat a));
78 task->run(); 84 // task->run();
79 } 85 // }
80 86
81 void Microtask::enqueueMicrotask(PassOwnPtr<WebThread::Task> callback) 87 void Microtask::enqueueMicrotask(PassOwnPtr<WebThread::Task> callback)
82 { 88 {
83 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 89 microtaskQueue().append(callback);
84 isolate->EnqueueMicrotask(&microtaskFunctionCallback, callback.leakPtr());
85 } 90 }
86 91
87 void Microtask::enqueueMicrotask(const base::Closure& callback) 92 void Microtask::enqueueMicrotask(const base::Closure& callback)
88 { 93 {
89 enqueueMicrotask(adoptPtr(new Task(callback))); 94 enqueueMicrotask(adoptPtr(new Task(callback)));
90 } 95 }
91 96
92 } // namespace blink 97 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/dom/ExecutionContext.cpp ('k') | sky/engine/core/dom/MutationObserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698