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

[weinig at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit d2d3ff31ba6445d8825fa0c0af0ca1073f286419
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 13 03:59:30 2009 +0000

    Rubber-stamped by Dan Bernstein.
    
    Fix the !ENABLE(VIDEO) build.
    
    * rendering/RenderLayerCompositor.cpp:
    (WebCore::RenderLayerCompositor::requiresCompositingForVideo):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52061 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 187c1f9..8cf4d2e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Rubber-stamped by Dan Bernstein.
 
+        Fix the !ENABLE(VIDEO) build.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::requiresCompositingForVideo):
+
+2009-12-12  Sam Weinig  <sam at webkit.org>
+
+        Rubber-stamped by Dan Bernstein.
+
         Fix the !ENABLE(DATABASE) build.
 
         * storage/SQLTransactionClient.cpp:
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index 2f5e267..a7e37cd 100644
--- a/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/WebCore/rendering/RenderLayerCompositor.cpp
@@ -955,6 +955,8 @@ bool RenderLayerCompositor::requiresCompositingForVideo(RenderObject* renderer)
         RenderVideo* video = toRenderVideo(renderer);
         return canAccelerateVideoRendering(video);
     }
+#else
+    UNUSED_PARAM(renderer);
 #endif
     return false;
 }

-- 
WebKit Debian packaging