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

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 4b6d56a540b5c95263a2914e04968826180717f3
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 16 21:55:28 2010 +0000

    2010-02-16  Simon Fraser  <simon.fraser at apple.com>
    
            Build fix for platforms without ACCELERATED_COMPOSITING defined.
    
            mediaPlayerRenderingModeChanged() is only available when ACCELERATED_COMPOSITING is defined.
    
            * platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp:
            (WebCore::MediaPlayerPrivate::setUpVideoRendering):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54827 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 66e33b9..529ad8c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-02-16  Simon Fraser  <simon.fraser at apple.com>
 
+        Build fix for platforms without ACCELERATED_COMPOSITING defined.
+
+        mediaPlayerRenderingModeChanged() is only available when ACCELERATED_COMPOSITING is defined.
+        
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp:
+        (WebCore::MediaPlayerPrivate::setUpVideoRendering):
+
+2010-02-16  Simon Fraser  <simon.fraser at apple.com>
+
         Reviewed by Eric Carlson.
 
         Autoplaying video with poster doesn't reliably show up
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
index bf185f0..4184fb2 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
@@ -753,8 +753,10 @@ void MediaPlayerPrivate::setUpVideoRendering()
     if (preferredMode == MediaRenderingMovieLayer)
         createLayerForMovie();
 
+#if USE(ACCELERATED_COMPOSITING)
     if (currentMode == MediaRenderingMovieLayer || preferredMode == MediaRenderingMovieLayer)
         m_player->mediaPlayerClient()->mediaPlayerRenderingModeChanged(m_player);
+#endif
 }
 
 void MediaPlayerPrivate::tearDownVideoRendering()

-- 
WebKit Debian packaging