Changeset 149749 in webkit


Ignore:
Timestamp:
May 8, 2013, 10:16:21 AM (12 years ago)
Author:
eric.carlson@apple.com
Message:

Prevent crash when track is deleted during video element deletion.
​https://bugs.webkit.org/show_bug.cgi?id=106183

Reviewed by Dean Jackson.

Source/WebCore:

Test: media/track/track-remove-crash.html

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::removedFrom): Set m_inActiveDocument to false so we

do not process text track cues or dispatch related events.

LayoutTests:

  • media/track/track-remove-crash-expected.txt: Added.
  • media/track/track-remove-crash.html: Added.
Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r149746 r149749  
     12013-05-08  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Prevent crash when track is deleted during video element deletion.
     4        https://bugs.webkit.org/show_bug.cgi?id=106183
     5
     6        Reviewed by Dean Jackson.
     7
     8        * media/track/track-remove-crash-expected.txt: Added.
     9        * media/track/track-remove-crash.html: Added.
     10
    1112013-05-08  David Kilzer  <ddkilzer@apple.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r149744 r149749  
     12013-05-08  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Prevent crash when track is deleted during video element deletion.
     4        https://bugs.webkit.org/show_bug.cgi?id=106183
     5
     6        Reviewed by Dean Jackson.
     7
     8        Test: media/track/track-remove-crash.html
     9
     10        * html/HTMLMediaElement.cpp:
     11        (WebCore::HTMLMediaElement::removedFrom): Set m_inActiveDocument to false so we
     12            do not process text track cues or dispatch related events.
     13
    1142013-05-08  Eric Carlson  <eric.carlson@apple.com>
    215

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r149741 r149749  
    588588void HTMLMediaElement::removedFrom(ContainerNode* insertionPoint)
    589589{
     590    m_inActiveDocument = false;
     591
    590592    if (insertionPoint->inDocument()) {
    591         LOG(Media, "HTMLMediaElement::removedFromDocument");
     593        LOG(Media, "HTMLMediaElement::removedFrom");
    592594        configureMediaControls();
    593595        if (m_networkState > NETWORK_EMPTY)
Note: See TracChangeset for help on using the changeset viewer.