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

[andersca at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit d576cbe3cb1503156457b227fb5cb38a8bef4bfe
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 22:04:20 2010 +0000

    Fix !ENABLE(3D_CANVAS) build.
    
    * rendering/RenderLayerBacking.cpp:
    (WebCore::is3DCanvas):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53428 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5a890a0..b187283 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-18  Anders Carlsson  <andersca at apple.com>
+
+        Fix !ENABLE(3D_CANVAS) build.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::is3DCanvas):
+
 2010-01-18  Timothy Hatcher  <timothy at apple.com>
 
         Adjust the scroll position when doing a full page zoom, so the content
diff --git a/WebCore/rendering/RenderLayerBacking.cpp b/WebCore/rendering/RenderLayerBacking.cpp
index 54e43d6..21363c3 100644
--- a/WebCore/rendering/RenderLayerBacking.cpp
+++ b/WebCore/rendering/RenderLayerBacking.cpp
@@ -67,6 +67,8 @@ static inline bool is3DCanvas(RenderObject* renderer)
 #if ENABLE(3D_CANVAS)    
     if (renderer->isCanvas())
         return static_cast<HTMLCanvasElement*>(renderer->node())->is3D();
+#else
+    UNUSED_PARAM(renderer);
 #endif
     return false;
 }

-- 
WebKit Debian packaging