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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d2e7c639d07da5382207d5b9ecd39b72016f0d52
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 20:59:09 2010 +0000

    2010-02-26  Jarkko Sakkinen  <jarkko.sakkinen at tieto.com>
    
             Reviewed by Kenneth Rohde Christiansen.
    
             https://bugs.webkit.org/show_bug.cgi?id=35380
             Fixed compilation error when WTF_USE_ACCELERATED_COMPOSITING=0
    
             * css/MediaQueryEvaluator.cpp:
             (WebCore::transform_3dMediaFeatureEval):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55303 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 68bfce5..7d91c2b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-26  Jarkko Sakkinen  <jarkko.sakkinen at tieto.com>
+ 
+         Reviewed by Kenneth Rohde Christiansen.
+
+         https://bugs.webkit.org/show_bug.cgi?id=35380
+         Fixed compilation error when WTF_USE_ACCELERATED_COMPOSITING=0
+ 
+         * css/MediaQueryEvaluator.cpp:
+         (WebCore::transform_3dMediaFeatureEval):
+
 2010-02-26  Nicholas Young  <nicholas.young at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebCore/css/MediaQueryEvaluator.cpp b/WebCore/css/MediaQueryEvaluator.cpp
index 4963ed4..aa867b3 100644
--- a/WebCore/css/MediaQueryEvaluator.cpp
+++ b/WebCore/css/MediaQueryEvaluator.cpp
@@ -47,7 +47,7 @@
 #include "PlatformScreen.h"
 #include <wtf/HashMap.h>
 
-#if ENABLE(3D_RENDERING)
+#if ENABLE(3D_RENDERING) && USE(ACCELERATED_COMPOSITING)
 #include "RenderLayerCompositor.h"
 #endif
 
@@ -474,8 +474,10 @@ static bool transform_3dMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* f
 
 #if ENABLE(3D_RENDERING)
     bool threeDEnabled = false;
+#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* view = frame->contentRenderer())
         threeDEnabled = view->compositor()->hasAcceleratedCompositing();
+#endif
 
     returnValueIfNoParameter = threeDEnabled;
     have3dRendering = threeDEnabled ? 1 : 0;

-- 
WebKit Debian packaging