diff options
Diffstat (limited to 'WebCore/bindings/v8/V8Proxy.cpp')
| -rw-r--r-- | WebCore/bindings/v8/V8Proxy.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp index 27e09e6..be2be07 100644 --- a/WebCore/bindings/v8/V8Proxy.cpp +++ b/WebCore/bindings/v8/V8Proxy.cpp @@ -687,11 +687,7 @@ void V8Proxy::didLeaveScriptContext() // 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. - if (IDBPendingTransactionMonitor::hasPendingTransactions()) { - ASSERT(page->group().hasIDBFactory()); - page->group().idbFactory()->abortPendingTransactions(IDBPendingTransactionMonitor::pendingTransactions()); - IDBPendingTransactionMonitor::clearPendingTransactions(); - } + IDBPendingTransactionMonitor::abortPendingTransactions(); #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. @@ -876,14 +872,21 @@ bool V8Proxy::registeredExtensionWithV8(v8::Extension* extension) void V8Proxy::registerExtension(v8::Extension* extension, const String& schemeRestriction) { registerExtensionWithV8(extension); - V8ExtensionInfo info = {schemeRestriction, 0, extension}; + V8ExtensionInfo info = {schemeRestriction, 0, extension, false}; m_extensions.append(info); } void V8Proxy::registerExtension(v8::Extension* extension, int extensionGroup) { registerExtensionWithV8(extension); - V8ExtensionInfo info = {String(), extensionGroup, extension}; + V8ExtensionInfo info = {String(), extensionGroup, extension, false}; + m_extensions.append(info); +} + +void V8Proxy::registerExtension(v8::Extension* extension) +{ + registerExtensionWithV8(extension); + V8ExtensionInfo info = {String(), 0, extension, true}; m_extensions.append(info); } |