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

vestbo at webkit.org vestbo at webkit.org
Wed Dec 22 13:57:24 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit fff5b5ed386ccb2e53a265cd68720669a2d4e0df
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 12:00:26 2010 +0000

    [Qt] Ensure that the media player backend does not leave any resources around
    
    Reviewed by Simon Hausmann.
    
    * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
    (WebCore::MediaPlayerPrivateQt::~MediaPlayerPrivateQt):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68774 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2faabbb..ca4ad7f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -17,6 +17,15 @@
 
         Reviewed by Simon Hausmann.
 
+        [Qt] Ensure that the media player backend does not leave any resources around
+
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivateQt::~MediaPlayerPrivateQt):
+
+2010-09-30  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
         Minor cleanup of MediaPlayerPrivateQt
 
         * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index 3cb98c6..5e70c71 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -133,6 +133,9 @@ MediaPlayerPrivateQt::MediaPlayerPrivateQt(MediaPlayer* player)
 
 MediaPlayerPrivateQt::~MediaPlayerPrivateQt()
 {
+    m_mediaPlayer->stop();
+    m_mediaPlayer->setMedia(QMediaContent());
+
     delete m_mediaPlayer;
     delete m_videoScene;
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list