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

Side by Side Diff: Source/WebCore/bindings/v8/V8RecursionScope.cpp

Issue 9951003: Merge 112161 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 8 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 | « Source/WebCore/bindings/v8/V8RecursionScope.h ('k') | no next file » | 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) 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 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 "V8RecursionScope.h" 32 #include "V8RecursionScope.h"
33 33
34 #include "IDBPendingTransactionMonitor.h" 34 #include "IDBPendingTransactionMonitor.h"
35 #include "ScriptExecutionContext.h"
36 #include "WebKitMutationObserver.h" 35 #include "WebKitMutationObserver.h"
37 36
38 namespace WebCore { 37 namespace WebCore {
39 38
40 void V8RecursionScope::didLeaveScriptContext(ScriptExecutionContext* context) 39 void V8RecursionScope::didLeaveScriptContext()
41 { 40 {
42 // FIXME: Instrument any work that takes place when script exits to c++ (e.g . Mutation Observers). 41 // FIXME: Instrument any work that takes place when script exits to c++ (e.g . Mutation Observers).
43 42
44 #if ENABLE(INDEXED_DATABASE) 43 #if ENABLE(INDEXED_DATABASE)
45 // If we've just left a script context and indexed database has been 44 // If we've just left a script context and indexed database has been
46 // instantiated, we must let its transaction coordinator know so it can term inate 45 // instantiated, we must let its transaction coordinator know so it can term inate
47 // any not-yet-started transactions. 46 // any not-yet-started transactions.
48 IDBPendingTransactionMonitor::abortPendingTransactions(); 47 IDBPendingTransactionMonitor::abortPendingTransactions();
49 #endif 48 #endif
50 49
51 #if ENABLE(MUTATION_OBSERVERS) 50 #if ENABLE(MUTATION_OBSERVERS)
52 if (context && context->isDocument()) 51 if (m_isDocumentContext)
53 WebKitMutationObserver::deliverAllMutations(); 52 WebKitMutationObserver::deliverAllMutations();
54 #endif 53 #endif
55 } 54 }
56 55
57 } // namespace WebCore 56 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/bindings/v8/V8RecursionScope.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698