diff options
| author | Steve Block <steveblock@google.com> | 2010-08-27 12:46:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:21 +0100 |
| commit | da73cf3d4a061de38a3910c675cd9b6f0a43f220 (patch) | |
| tree | 5e5a0faeef1706d8d798babb651db5caaee88b6d /WebCore | |
| parent | 95584b8973cc39a1cbed21e378571c878b7acf6d (diff) | |
| download | external_webkit-da73cf3d4a061de38a3910c675cd9b6f0a43f220.zip external_webkit-da73cf3d4a061de38a3910c675cd9b6f0a43f220.tar.gz external_webkit-da73cf3d4a061de38a3910c675cd9b6f0a43f220.tar.bz2 | |
Merge WebKit at r66079 : Cherry-pick WebKit change 66211 to add missing IndexedDB guards
See http://trac.webkit.org/changeset/66211
Change-Id: I61a04cf700bc84dd5ff173cc79befc28497fddd2
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bindings/v8/V8Proxy.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp index 5d3eeb8..c661db4 100644 --- a/WebCore/bindings/v8/V8Proxy.cpp +++ b/WebCore/bindings/v8/V8Proxy.cpp @@ -682,6 +682,7 @@ void V8Proxy::didLeaveScriptContext() Page* page = m_frame->page(); if (!page) return; +#if ENABLE(INDEXED_DATABASE) // If we've just left a script context and indexed database has been // instantiated, we must let its transaction coordinator know so it can terminate // any not-yet-started transactions. @@ -690,6 +691,7 @@ void V8Proxy::didLeaveScriptContext() page->group().idbFactory()->abortPendingTransactions(IDBPendingTransactionMonitor::pendingTransactions()); IDBPendingTransactionMonitor::clearPendingTransactions(); } +#endif // ENABLE(INDEXED_DATABASE) // If we've just left a top level script context and local storage has been // instantiated, we must ensure that any storage locks have been freed. // Per http://dev.w3.org/html5/spec/Overview.html#storage-mutex |