OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 13 matching lines...) Expand all Loading... | |
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 "bindings/v8/V8RecursionScope.h" | 32 #include "bindings/v8/V8RecursionScope.h" |
33 | 33 |
34 #include "core/dom/ExecutionContext.h" | |
34 #include "core/dom/Microtask.h" | 35 #include "core/dom/Microtask.h" |
36 #include "core/workers/WorkerGlobalScope.h" | |
37 #include "core/workers/WorkerThread.h" | |
35 #include "modules/indexeddb/IDBPendingTransactionMonitor.h" | 38 #include "modules/indexeddb/IDBPendingTransactionMonitor.h" |
36 | 39 |
37 namespace WebCore { | 40 namespace WebCore { |
38 | 41 |
39 void V8RecursionScope::didLeaveScriptContext() | 42 void V8RecursionScope::didLeaveScriptContext() |
40 { | 43 { |
41 // FIXME: Instrument any work that takes place when script exits to c++ (e.g . Mutation Observers). | 44 // FIXME: Instrument any work that takes place when script exits to c++ (e.g . Mutation Observers). |
42 | 45 |
43 // Indexed DB requires that transactions are created with an internal |activ e| flag | 46 // Indexed DB requires that transactions are created with an internal |activ e| flag |
44 // set to true, but the flag becomes false when control returns to the event loop. | 47 // set to true, but the flag becomes false when control returns to the event loop. |
45 IDBPendingTransactionMonitor::deactivateNewTransactions(); | 48 IDBPendingTransactionMonitor::deactivateNewTransactions(); |
46 | 49 |
47 if (m_isDocumentContext) | 50 if (!isStopped()) |
48 Microtask::performCheckpoint(); | 51 Microtask::performCheckpoint(); |
49 } | 52 } |
50 | 53 |
54 bool V8RecursionScope::isStopped() | |
55 { | |
56 if (!m_context || m_context->activeDOMObjectsAreStopped()) | |
adamk
2014/03/28 17:55:05
How do you know a null context indicates "stopped"
| |
57 return true; | |
58 if (m_context->isDocument()) | |
59 return false; | |
60 if (m_context->isWorkerGlobalScope()) { | |
61 WorkerGlobalScope* workerContext = toWorkerGlobalScope(m_context); | |
62 WorkerThread* thread = workerContext->thread(); | |
63 return workerContext->isClosing() || !thread || thread->runLoop().termin ated(); | |
64 } | |
65 return true; | |
66 } | |
67 | |
51 } // namespace WebCore | 68 } // namespace WebCore |
OLD | NEW |