2011-02-06 Maciej Stachowiak <mjs@apple.com>
authormjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 6 Feb 2011 20:05:38 +0000 (20:05 +0000)
committermjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 6 Feb 2011 20:05:38 +0000 (20:05 +0000)
        Reviewed by Antti Koivisto.

        media/video-document-types.html sometimes crashes the WebProcess
        https://bugs.webkit.org/show_bug.cgi?id=53884

        No new tests. Already covered by media/video-document-types.html

        * html/HTMLMediaElement.cpp:
        (WebCore::HTMLMediaElement::userCancelledLoad): Stop the load timer
        when cancelling the load.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77776 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/html/HTMLMediaElement.cpp

index 78e367221dbf6522ce233f2c51e6208a44cd097d..232fa0791701ca6e6d6e717e5b555ccba0a3f14e 100644 (file)
@@ -1,3 +1,16 @@
+2011-02-06  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Antti Koivisto.
+
+        media/video-document-types.html sometimes crashes the WebProcess
+        https://bugs.webkit.org/show_bug.cgi?id=53884
+
+        No new tests. Already covered by media/video-document-types.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::userCancelledLoad): Stop the load timer
+        when cancelling the load.
+
 2011-02-06  Patrick Gansterer  <paroga@webkit.org>
 
         Reviewed by Adam Roben.
index f0b703da501f7039a4916094048ada8ed8eb42c5..2cf47cc62e5a71f63398f62a32ccb2245c40910c 100644 (file)
@@ -2172,6 +2172,7 @@ void HTMLMediaElement::userCancelledLoad()
     m_player.clear();
 #endif
     stopPeriodicTimers();
+    m_loadTimer.stop();
     m_loadState = WaitingForSource;
 
     // 2 - Set the error attribute to a new MediaError object whose code attribute is set to MEDIA_ERR_ABORTED.