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

[ossy at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c63fdeebea0e02047c5f8de26562699e94c92151
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 16 23:03:58 2010 +0000

    Buildfix for r54826.
    
    Reviewed by Eric Carlson.
    
    HTMLMediaElement class defined by HTMLMediaElement.h in #if ENABLE(VIDEO) block,
    it should be in #if ENABLE(VIDEO) block in rendering/RenderLayerBacking.cpp too.
    
    * rendering/RenderLayerBacking.cpp: Missing #if ENABLE(VIDEO) guard added.
    (WebCore::RenderLayerBacking::updateGraphicsLayerConfiguration):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54839 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cdec43d..bb36269 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-16  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Eric Carlson.
+
+        Buildfix for r54826.
+
+        HTMLMediaElement class defined by HTMLMediaElement.h in #if ENABLE(VIDEO) block,
+        it should be in #if ENABLE(VIDEO) block in rendering/RenderLayerBacking.cpp too.
+
+        * rendering/RenderLayerBacking.cpp: Missing #if ENABLE(VIDEO) guard added.
+        (WebCore::RenderLayerBacking::updateGraphicsLayerConfiguration):
+
 2010-02-16  Julie Parent  <jparent at chromium.org>
 
         Unreviewed: Chromium build fix.
diff --git a/WebCore/rendering/RenderLayerBacking.cpp b/WebCore/rendering/RenderLayerBacking.cpp
index e8069dd..f637e3c 100644
--- a/WebCore/rendering/RenderLayerBacking.cpp
+++ b/WebCore/rendering/RenderLayerBacking.cpp
@@ -215,10 +215,13 @@ bool RenderLayerBacking::updateGraphicsLayerConfiguration()
     if (renderer()->isEmbeddedObject() && toRenderEmbeddedObject(renderer())->allowsAcceleratedCompositing()) {
         PluginWidget* pluginWidget = static_cast<PluginWidget*>(toRenderEmbeddedObject(renderer())->widget());
         m_graphicsLayer->setContentsToMedia(pluginWidget->platformLayer());
-    } else if (renderer()->isVideo()) {
+    }
+#if ENABLE(VIDEO)
+    else if (renderer()->isVideo()) {
         HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(renderer()->node());
         m_graphicsLayer->setContentsToMedia(mediaElement->platformLayer());
     }
+#endif
 #if ENABLE(3D_CANVAS)    
     else if (is3DCanvas(renderer())) {
         HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(renderer()->node());

-- 
WebKit Debian packaging