Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: Source/WebCore/html/HTMLMediaElement.cpp

Issue 7947001: Merge 94608 - MediaElementAudioSourceNode destruction triggers ASSERTS (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/WebCore/webaudio/AudioContext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 2958 matching lines...) Expand 10 before | Expand all | Expand 10 after
2969 2969
2970 #if ENABLE(WEB_AUDIO) 2970 #if ENABLE(WEB_AUDIO)
2971 if (m_audioSourceNode) 2971 if (m_audioSourceNode)
2972 m_audioSourceNode->unlock(); 2972 m_audioSourceNode->unlock();
2973 #endif 2973 #endif
2974 } 2974 }
2975 2975
2976 #if ENABLE(WEB_AUDIO) 2976 #if ENABLE(WEB_AUDIO)
2977 void HTMLMediaElement::setAudioSourceNode(MediaElementAudioSourceNode* sourceNod e) 2977 void HTMLMediaElement::setAudioSourceNode(MediaElementAudioSourceNode* sourceNod e)
2978 { 2978 {
2979 ASSERT(!m_audioSourceNode);
2980 m_audioSourceNode = sourceNode; 2979 m_audioSourceNode = sourceNode;
2981 } 2980 }
2982 2981
2983 AudioSourceProvider* HTMLMediaElement::audioSourceProvider() 2982 AudioSourceProvider* HTMLMediaElement::audioSourceProvider()
2984 { 2983 {
2985 if (m_player) 2984 if (m_player)
2986 return m_player->audioSourceProvider(); 2985 return m_player->audioSourceProvider();
2987 2986
2988 return 0; 2987 return 0;
2989 } 2988 }
2990 #endif 2989 #endif
2991 2990
2992 } 2991 }
2993 2992
2994 #endif 2993 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/webaudio/AudioContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698