Title: [158870] trunk/Source/WebCore
- Revision
- 158870
- Author
- [email protected]
- Date
- 2013-11-07 13:47:32 -0800 (Thu, 07 Nov 2013)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158869 => 158870)
--- trunk/Source/WebCore/ChangeLog 2013-11-07 21:43:22 UTC (rev 158869)
+++ trunk/Source/WebCore/ChangeLog 2013-11-07 21:47:32 UTC (rev 158870)
@@ -1,3 +1,15 @@
+2013-11-07 Ryosuke Niwa <[email protected]>
+
+ 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):
+
2013-11-07 Jer Noble <[email protected]>
[Mac] Crash at com.apple.WebCore: -[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:] + 2084
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (158869 => 158870)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-11-07 21:43:22 UTC (rev 158869)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-11-07 21:47:32 UTC (rev 158870)
@@ -382,8 +382,10 @@
}
#endif
- if (m_mediaController)
+ if (m_mediaController) {
m_mediaController->removeMediaElement(this);
+ m_mediaController = 0;
+ }
#if ENABLE(MEDIA_SOURCE)
closeMediaSource();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
