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

[crogers at google.com]

The following commit has been merged in the debian/experimental branch:
commit 2477f3222e39b56fa280bf55b538975b3f6d87ad
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 22:06:54 2010 +0000

    2010-09-29  Chris Rogers  <crogers at google.com>
    
            Reviewed by Kenneth Russell.
    
            Minor cleanup to AudioContext
            https://bugs.webkit.org/show_bug.cgi?id=46843
    
            No new tests since audio API is not yet implemented
    
            * webaudio/AudioContext.cpp:
            (WebCore::AudioContext::lock):
            (WebCore::AudioContext::handleDeferredFinishDerefs):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68692 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 16f11d9..dea56c3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-29  Chris Rogers  <crogers at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Minor cleanup to AudioContext
+        https://bugs.webkit.org/show_bug.cgi?id=46843
+
+        No new tests since audio API is not yet implemented
+
+        * webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::lock):
+        (WebCore::AudioContext::handleDeferredFinishDerefs):
+
 2010-09-29  MORITA Hajime  <morrita at google.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/webaudio/AudioContext.cpp b/WebCore/webaudio/AudioContext.cpp
index 63a26a2..a7c8087 100644
--- a/WebCore/webaudio/AudioContext.cpp
+++ b/WebCore/webaudio/AudioContext.cpp
@@ -348,10 +348,9 @@ void AudioContext::lock(bool& mustReleaseLock)
     } else {
         // Acquire the lock.
         m_contextGraphMutex.lock();
+        m_graphOwnerThread = thisThread;
         mustReleaseLock = true;
     }
-
-    m_graphOwnerThread = thisThread;
 }
 
 bool AudioContext::tryLock(bool& mustReleaseLock)
@@ -436,7 +435,7 @@ void AudioContext::handlePostRenderTasks()
 
 void AudioContext::handleDeferredFinishDerefs()
 {
-    ASSERT(isAudioThread());
+    ASSERT(isAudioThread() && isGraphOwner());
     for (unsigned i = 0; i < m_deferredFinishDerefList.size(); ++i) {
         AudioNode* node = m_deferredFinishDerefList[i].m_node;
         AudioNode::RefType refType = m_deferredFinishDerefList[i].m_refType;

-- 
WebKit Debian packaging