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

[eric.carlson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit c48c5bc42b9c42257278f38a190e1c1e4e29f253
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 13 15:52:18 2010 +0000

    2010-08-13  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by David Kilzer.
    
            HTMLMediaElement::prepareForLoad should cancel current plug-in proxy media player
            https://bugs.webkit.org/show_bug.cgi?id=43923
    
            * html/HTMLMediaElement.cpp:
            (WebCore::HTMLMediaElement::prepareForLoad): Tell mediaPlayer to cancel the current load
            if it already exists.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65324 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 31b030e..0d459eb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-13  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by David Kilzer.
+
+        HTMLMediaElement::prepareForLoad should cancel current plug-in proxy media player
+        https://bugs.webkit.org/show_bug.cgi?id=43923
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::prepareForLoad): Tell mediaPlayer to cancel the current load
+        if it already exists.
+
 2010-08-12  Stephen White  <senorblanco at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp
index bcbf6c2..53a8968 100644
--- a/WebCore/html/HTMLMediaElement.cpp
+++ b/WebCore/html/HTMLMediaElement.cpp
@@ -511,7 +511,10 @@ void HTMLMediaElement::prepareForLoad()
 #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     m_player = MediaPlayer::create(this);
 #else
-    createMediaPlayerProxy();
+    if (m_player)
+        m_player->cancelLoad();
+    else
+        createMediaPlayerProxy();
 #endif
 
     // 4 - If the media element's networkState is not set to NETWORK_EMPTY, then run these substeps

-- 
WebKit Debian packaging