[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 3496176d4d0534740a1e25c77aec70813d4b9a9c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 08:21:32 2010 +0000

    2010-01-14  Eric Seidel  <eric at webkit.org>
    
            No review.  Tiger build fix after http://trac.webkit.org/changeset/53238.
    
            Need to implement WebGLContextAttributes
            https://bugs.webkit.org/show_bug.cgi?id=31169
    
            Fix a build break when ENABLE(3D_CANVAS) is disabled.
    
            * html/HTMLCanvasElement.cpp:
            (WebCore::HTMLCanvasElement::getContext): UNUSED_PARAM(attrs) when 3D_CANVAS is disabled.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53243 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8480112..0bbff28 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-14  Eric Seidel  <eric at webkit.org>
+
+        No review.  Tiger build fix after http://trac.webkit.org/changeset/53238.
+
+        Need to implement WebGLContextAttributes
+        https://bugs.webkit.org/show_bug.cgi?id=31169
+
+        Fix a build break when ENABLE(3D_CANVAS) is disabled.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::getContext): UNUSED_PARAM(attrs) when 3D_CANVAS is disabled.
+
 2010-01-13  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/html/HTMLCanvasElement.cpp b/WebCore/html/HTMLCanvasElement.cpp
index fd483b0..8c298c5 100644
--- a/WebCore/html/HTMLCanvasElement.cpp
+++ b/WebCore/html/HTMLCanvasElement.cpp
@@ -185,6 +185,8 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, Canvas
             return m_context.get();
         }
     }
+#else
+    UNUSED_PARAM(attrs);
 #endif
     return 0;
 }

-- 
WebKit Debian packaging