[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[jwieczorek at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3bb540a7ad72cf760d240c67a21d7304e8ca65f5
Author: jwieczorek at webkit.org <jwieczorek at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 16:18:56 2010 +0000

    2010-03-16  Jakub Wieczorek  <jwieczorek at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [Qt] MediaPlayerPrivate: Initialize m_mediaPlayerControl to 0 to
            avoid crashes when no media services can be found.
    
            https://bugs.webkit.org/show_bug.cgi?id=36142
    
            * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
            (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56065 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cbc7f3c..2af32c6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-16  Jakub Wieczorek  <jwieczorek at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] MediaPlayerPrivate: Initialize m_mediaPlayerControl to 0 to avoid crashes
+        when no media services can be found.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36142
+
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+
 2010-03-16  Adam Barth  <abarth at webkit.org>
 
         Unreviewed.
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index 6677e72..66ffe23 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -86,6 +86,7 @@ MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& mime, c
 MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
     : m_player(player)
     , m_mediaPlayer(new QMediaPlayer)
+    , m_mediaPlayerControl(0)
     , m_videoItem(new QGraphicsVideoItem)
     , m_videoScene(new QGraphicsScene)
     , m_networkState(MediaPlayer::Empty)

-- 
WebKit Debian packaging