Title: [187679] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187679
- Author
- [email protected]
- Date
- 2015-07-31 13:38:22 -0700 (Fri, 31 Jul 2015)
Log Message
Merged r187675. rdar://problem/21632211
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187678 => 187679)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-31 20:36:19 UTC (rev 187678)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-31 20:38:22 UTC (rev 187679)
@@ -1,3 +1,20 @@
+2015-07-31 Babak Shafiei <[email protected]>
+
+ Merge r187675.
+
+ 2015-07-31 Jer Noble <[email protected]>
+
+ CRASH at WebCore::TaskDispatcher<WebCore::ScriptExecutionContext>::postTask + 38
+ https://bugs.webkit.org/show_bug.cgi?id=147485
+
+ Rubber-stamped by Joseph Pecoraro.
+
+ Follow-up test crash fix: call superclass's contextDestroyed() which allows the
+ m_scriptExecutionContext variable to be cleared.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::contextDestroyed):
+
2015-07-31 Matthew Hanson <[email protected]>
Merge r187655. rdar://problem/21632211
Modified: branches/safari-601.1-branch/Source/WebCore/html/HTMLMediaElement.cpp (187678 => 187679)
--- branches/safari-601.1-branch/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-31 20:36:19 UTC (rev 187678)
+++ branches/safari-601.1-branch/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-31 20:38:22 UTC (rev 187679)
@@ -4908,6 +4908,8 @@
m_seekTaskQueue.close();
m_resizeTaskQueue.close();
m_shadowDOMTaskQueue.close();
+
+ ActiveDOMObject::contextDestroyed();
}
void HTMLMediaElement::stop()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
