HTMLMediaElement::clearMediaPlayer should acquire MediaElementAudioSourceNode::lock()

Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 342 matching lines @@
     // See http://crbug.com/233654 for more details.
     m_completelyLoaded = true;
 
     // Destroying the player may cause a resource load to be canceled,
     // which could result in Document::dispatchWindowLoadEvent() being
     // called via ResourceFetch::didLoadResource() then
     // FrameLoader::loadDone(). To prevent load event dispatching during
     // object destruction, we use Document::incrementLoadEventDelayCount().
     // See http://crbug.com/275223 for more details.
     document().incrementLoadEventDelayCount();
-    m_player.clear();
-#if ENABLE(WEB_AUDIO)
-    if (audioSourceProvider())
-        audioSourceProvider()->setClient(0);
-#endif
+
+    clearMediaPlayerAndAudioSourceProviderClient();
+
     document().decrementLoadEventDelayCount();
 }
 
 void HTMLMediaElement::didMoveToNewDocument(Document& oldDocument)
 {
     LOG(Media, "HTMLMediaElement::didMoveToNewDocument");
 
     if (m_shouldDelayLoadEvent) {
         document().incrementLoadEventDelayCount();
         // Note: Keeping the load event delay count increment on oldDocument that was added
@@ skipping 2998 matching lines @@
     // 6 - Abort the overall resource selection algorithm.
     m_currentSourceNode = 0;
 
     // Reset m_readyState since m_player is gone.
     m_readyState = HAVE_NOTHING;
     updateMediaController();
     if (RuntimeEnabledFeatures::videoTrackEnabled())
         updateActiveTextTrackCues(0);
 }
 
+void HTMLMediaElement::clearMediaPlayerAndAudioSourceProviderClient()
+{
+#if ENABLE(WEB_AUDIO)
+    if (m_audioSourceNode)
+        m_audioSourceNode->lock();
+
+    if (audioSourceProvider())
+        audioSourceProvider()->setClient(0);
+#endif
+
+    m_player.clear();
+
+#if ENABLE(WEB_AUDIO)
+    if (m_audioSourceNode)
+        m_audioSourceNode->unlock();
+#endif
+}
+
 void HTMLMediaElement::clearMediaPlayer(int flags)
 {
     removeAllInbandTracks();
 
     closeMediaSource();
 
-    m_player.clear();
-#if ENABLE(WEB_AUDIO)
-    if (audioSourceProvider())
-        audioSourceProvider()->setClient(0);
-#endif
+    clearMediaPlayerAndAudioSourceProviderClient();
+
     stopPeriodicTimers();
     m_loadTimer.stop();
 
     m_pendingActionFlags &= ~flags;
     m_loadState = WaitingForSource;
 
     if (m_textTracks)
         configureTextTrackDisplay(AssumeNoVisibleChange);
 }
 
@@ skipping 292 matching lines @@
         m_audioSourceNode->unlock();
     }
 #endif
 }
 
 #if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::setAudioSourceNode(MediaElementAudioSourceNode* sourceNode)
 {
     m_audioSourceNode = sourceNode;
 
+    if (m_audioSourceNode)
+        m_audioSourceNode->lock();
+
     if (audioSourceProvider())
         audioSourceProvider()->setClient(m_audioSourceNode);
+
+    if (m_audioSourceNode)
+        m_audioSourceNode->unlock();
 }
 
 AudioSourceProvider* HTMLMediaElement::audioSourceProvider()
 {
     if (m_player)
         return m_player->audioSourceProvider();
 
     return 0;
 }
 #endif
@@ skipping 151 matching lines @@
 {
     scheduleLayerUpdate();
 }
 
 bool HTMLMediaElement::isInteractiveContent() const
 {
     return fastHasAttribute(controlsAttr);
 }
 
 }