[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[joepeck at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c3d6dff72702668a6e1bdebf601b05d591c0e02e
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 20:56:32 2010 +0000

    2010-09-29  Joseph Pecoraro  <joepeck at webkit.org>
    
            Reviewed by Simon Fraser.
    
            CRASH at WebCore::HTMLSourceElement::scheduleErrorEvent
            https://bugs.webkit.org/show_bug.cgi?id=46777
    
            It should not be possible to get to be in the LoadingFromSourceElement
            state with a null current source node. This was a possible scenario
            where the current source node was cleared but the load state was not
            cleared as well. Tried and could not create a test case for this.
    
            * html/HTMLMediaElement.cpp:
            (WebCore::HTMLMediaElement::userCancelledLoad): clear the load state because we also clear the current source node.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68682 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ed691cd..91057fc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-29  Joseph Pecoraro  <joepeck at webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        CRASH at WebCore::HTMLSourceElement::scheduleErrorEvent
+        https://bugs.webkit.org/show_bug.cgi?id=46777
+
+        It should not be possible to get to be in the LoadingFromSourceElement
+        state with a null current source node. This was a possible scenario
+        where the current source node was cleared but the load state was not
+        cleared as well. Tried and could not create a test case for this.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::userCancelledLoad): clear the load state because we also clear the current source node.
+
 2010-09-29  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp
index bc86778..00f448c 100644
--- a/WebCore/html/HTMLMediaElement.cpp
+++ b/WebCore/html/HTMLMediaElement.cpp
@@ -1997,6 +1997,7 @@ void HTMLMediaElement::userCancelledLoad()
     m_player.clear();
 #endif
     stopPeriodicTimers();
+    m_loadState = WaitingForSource;
 
     // 2 - Set the error attribute to a new MediaError object whose code attribute is set to MEDIA_ERR_ABORTED.
     m_error = MediaError::create(MediaError::MEDIA_ERR_ABORTED);

-- 
WebKit Debian packaging