[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit c0b32597df405226892ab718687bf537719f68a3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 20:15:28 2010 +0000

    2010-03-02  Kim Grönholm  <kim.gronholm at nomovok.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] GraphicsLayer: Video element with 3d transform crashes when AC is enabled.
            https://bugs.webkit.org/show_bug.cgi?id=35516
    
            No new tests.
    
            * platform/graphics/qt/GraphicsLayerQt.cpp:
            (WebCore::GraphicsLayerQt::setContentsToMedia):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f84169..ff0d7dc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-02  Kim Grönholm  <kim.gronholm at nomovok.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] GraphicsLayer: Video element with 3d transform crashes when AC is enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=35516
+
+        No new tests.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQt::setContentsToMedia):
+
 2010-03-02  Fridrich Strba  <fridrich.strba at bluewin.ch>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
index 9745bd0..9a2e932 100644
--- a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
@@ -849,9 +849,13 @@ void GraphicsLayerQt::setContentsBackgroundColor(const Color& color)
 
 void GraphicsLayerQt::setContentsToMedia(PlatformLayer* media)
 {
+    if (media) {
+        m_impl->m_pendingContent.contentType = GraphicsLayerQtImpl::MediaContentType;
+        m_impl->m_pendingContent.mediaLayer = media->toGraphicsObject();
+    } else
+        m_impl->m_pendingContent.contentType = GraphicsLayerQtImpl::HTMLContentType;
+
     m_impl->notifyChange(GraphicsLayerQtImpl::ContentChange);
-    m_impl->m_pendingContent.contentType = GraphicsLayerQtImpl::MediaContentType;
-    m_impl->m_pendingContent.mediaLayer = media->toGraphicsObject();
     GraphicsLayer::setContentsToMedia(media);
 }
 

-- 
WebKit Debian packaging