Skip to content
Permalink
Browse files
REGRESSION(r201385) ASSERT in WebCore::HTMLMediaElement::updateActive…
…TextTrackCues + 5688

https://bugs.webkit.org/show_bug.cgi?id=158164
<rdar://problem/26498634>

Reviewed by Jer Noble.

No new tests, this prevents an assert in existing tests.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::~HTMLMediaElement): Call beginIgnoringTrackDisplayUpdateRequests
  so we avoid doing unnecessary work triggered by destruction.


Canonical link: https://commits.webkit.org/176366@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@201574 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eric-carlson committed Jun 1, 2016
1 parent 273fe32 commit ef038ffab81f4fba3206c977413d07abbcf6e117
Showing with 15 additions and 0 deletions.
  1. +14 −0 Source/WebCore/ChangeLog
  2. +1 −0 Source/WebCore/html/HTMLMediaElement.cpp
@@ -1,3 +1,17 @@
2016-06-01 Eric Carlson <eric.carlson@apple.com>

REGRESSION(r201385) ASSERT in WebCore::HTMLMediaElement::updateActiveTextTrackCues + 5688
https://bugs.webkit.org/show_bug.cgi?id=158164
<rdar://problem/26498634>

Reviewed by Jer Noble.

No new tests, this prevents an assert in existing tests.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::~HTMLMediaElement): Call beginIgnoringTrackDisplayUpdateRequests
so we avoid doing unnecessary work triggered by destruction.

2016-06-01 Dean Jackson <dino@apple.com>

Fix iOS build.
@@ -497,6 +497,7 @@ HTMLMediaElement::~HTMLMediaElement()
{
LOG(Media, "HTMLMediaElement::~HTMLMediaElement(%p)", this);

beginIgnoringTrackDisplayUpdateRequests();
allMediaElements().remove(this);

m_asyncEventQueue.close();

0 comments on commit ef038ff

Please sign in to comment.