diff options
| author | Ryosuke Niwa <rniwa@webkit.org> | 2014-10-14 15:31:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-14 15:58:37 +0200 |
| commit | c3b2b9d23396e4853d152bef5479d8f05d651e27 (patch) | |
| tree | 5b23a7295848f7c171222370ef7282ac38b2875b | |
| parent | 53d70cef06876c306b4aaaadd36365dc8431fd8a (diff) | |
| download | qtwebkit-c3b2b9d23396e4853d152bef5479d8f05d651e27.tar.gz | |
Crash in HTMLMediaElement::contextDestroyed
https://bugs.webkit.org/show_bug.cgi?id=123963
Reviewed by Eric Carlson.
Merge https://chromium.googlesource.com/chromium/blink/+/177999cdb34b707465670f0feff723922939f278
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::~HTMLMediaElement):
Change-Id: If730e758410f18ae86aca5a92cb7c48b12b8c7ae
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@158870 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | Source/WebCore/html/HTMLMediaElement.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp index fc8578e57..395aabe80 100644 --- a/Source/WebCore/html/HTMLMediaElement.cpp +++ b/Source/WebCore/html/HTMLMediaElement.cpp @@ -374,8 +374,10 @@ HTMLMediaElement::~HTMLMediaElement() } #endif - if (m_mediaController) + if (m_mediaController) { m_mediaController->removeMediaElement(this); + m_mediaController = 0; + } #if ENABLE(MEDIA_SOURCE) setSourceState(MediaSource::closedKeyword()); |