[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 2d6d12a1d9a08d80a9b9213d5d91fb71509cef30
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 16 23:41:07 2010 +0000

    2010-02-16  Simon Fraser  <simon.fraser at apple.com>
    
            Build fix for Tiger.
    
            Add #if USE(ACCELERATED_COMPOSITING) around the call to mediaPlayerRenderingModeChanged().
    
            * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
            (WebCore::MediaPlayerPrivate::setUpVideoRendering):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54840 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bb36269..aeb53d5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-16  Simon Fraser  <simon.fraser at apple.com>
+
+        Build fix for Tiger.
+
+        Add #if USE(ACCELERATED_COMPOSITING) around the call to mediaPlayerRenderingModeChanged().
+        
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivate::setUpVideoRendering):
+
 2010-02-16  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Eric Carlson.
diff --git a/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm b/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
index 7b815db..2b90f7a 100644
--- a/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
+++ b/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
@@ -518,8 +518,10 @@ void MediaPlayerPrivate::setUpVideoRendering()
         break;
     }
 
+#if USE(ACCELERATED_COMPOSITING)
     if (currentMode == MediaRenderingMovieLayer || preferredMode == MediaRenderingMovieLayer)
         m_player->mediaPlayerClient()->mediaPlayerRenderingModeChanged(m_player);
+#endif
 }
 
 void MediaPlayerPrivate::tearDownVideoRendering()

-- 
WebKit Debian packaging