[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric.carlson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 402b2c0c7e3ea214d180af10dbd6997773f2e02f
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 23:47:54 2010 +0000

    2010-08-06  Eric Carlson  <eric.carlson at apple.com>
    
            Unreviewed, release Qt build fix.
    
            * rendering/RenderLayerBacking.cpp:
            (WebCore::RenderLayerBacking::containsPaintedContent): Guard call to toRenderVideo()
            with #if ENABLE(VIDEO).
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64886 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 68e2271..e76ac34 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-06  Eric Carlson  <eric.carlson at apple.com>
 
+        Unreviewed, release Qt build fix.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::containsPaintedContent): Guard call to toRenderVideo()
+        with #if ENABLE(VIDEO).
+
+2010-08-06  Eric Carlson  <eric.carlson at apple.com>
+
         Reviewed by Simon Fraser.
 
         HTML5 "video" tag with poster frame defined "flashes" right before movie displays
diff --git a/WebCore/rendering/RenderLayerBacking.cpp b/WebCore/rendering/RenderLayerBacking.cpp
index 68dc4d8..95ec3f3 100644
--- a/WebCore/rendering/RenderLayerBacking.cpp
+++ b/WebCore/rendering/RenderLayerBacking.cpp
@@ -759,8 +759,10 @@ bool RenderLayerBacking::containsPaintedContent() const
 
     // FIXME: we could optimize cases where the image, video or canvas is known to fill the border box entirely,
     // and set background color on the layer in that case, instead of allocating backing store and painting.
+#if ENABLE(VIDEO)
     if (renderer()->isVideo() && toRenderVideo(renderer())->shouldDisplayVideo())
         return hasBoxDecorationsOrBackground(renderer());
+#endif
 #if ENABLE(3D_CANVAS) || ENABLE(ACCELERATED_2D_CANVAS)
     if (isAcceleratedCanvas(renderer()))
         return hasBoxDecorationsOrBackground(renderer());

-- 
WebKit Debian packaging