[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[steveblock at google.com]

The following commit has been merged in the debian/experimental branch:
commit 83c4ea66a168c2596d660cf55407b2e3088ef9d7
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 12:24:31 2010 +0000

    2010-08-27  Steve Block  <steveblock at google.com>
    
            Reviewed by Jeremy Orlow.
    
            Calls to IndexedDB methods from V8Proxy::didLeaveScriptContext() are missing enable guards
            https://bugs.webkit.org/show_bug.cgi?id=44760
    
            No new tests, build fix only.
    
            * bindings/v8/V8Proxy.cpp:
            (WebCore::V8Proxy::didLeaveScriptContext):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66211 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c46e523..947af7f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-27  Steve Block  <steveblock at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        Calls to IndexedDB methods from V8Proxy::didLeaveScriptContext() are missing enable guards
+        https://bugs.webkit.org/show_bug.cgi?id=44760
+
+        No new tests, build fix only.
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::didLeaveScriptContext):
+
 2010-08-27  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index b239465..077c0df 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -648,6 +648,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.
@@ -656,6 +657,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

-- 
WebKit Debian packaging