[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

eric.carlson at apple.com eric.carlson at apple.com
Thu Feb 4 21:25:23 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit f16f1d1d39051633f4a00c5aa65204defc14dba0
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 23:49:39 2010 +0000

    2010-01-22  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Simon Fraser.
    
            Update r53711 for GraphicsLayer method rename.
    
            * platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp:
            (WebCore::MediaPlayerPrivate::createLayerForMovie): Rename from change setContentsToVideo.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53725 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fcb9367..46034ef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-22  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Update r53711 for GraphicsLayer method rename.
+
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp:
+        (WebCore::MediaPlayerPrivate::createLayerForMovie): Rename from change setContentsToVideo.
+
 2010-01-22  Jian Li  <jianli at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
index e749652..b2fe069 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
@@ -831,7 +831,7 @@ void MediaPlayerPrivate::createLayerForMovie()
 #endif
 
     // Hang the video layer from the render layer.
-    videoGraphicsLayer->setContentsToVideo(m_qtVideoLayer->platformLayer());
+    videoGraphicsLayer->setContentsToMedia(m_qtVideoLayer->platformLayer());
 #endif
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list