[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[oliver at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit e1209c40a82869e4088597841100143333232319
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 9 09:17:25 2009 +0000

    Build fix
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51892 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2937020..c925780 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-09  Oliver Hunt  <oliver at apple.com>
+
+        Build fix
+
+        * bindings/js/JSWebGLRenderingContextCustom.cpp:
+        (WebCore::functionForUniform):
+
 2009-12-08  Fumitoshi Ukai  <ukai at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 375c20a..20a769d 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -18244,8 +18244,8 @@
 				F4EAF4AF10C742B1009100D3 /* OpenTypeSanitizer.h in Headers */,
 				599D1E3310C97D6E00E0EF12 /* jni_utility_private.h in Headers */,
 				7ADE722610CBBB9B006B3B3A /* ContextMenuSelectionHandler.h in Headers */,
- 				0C3F1F5B10C8871200D72CE1 /* WebGLUniformLocation.h in Headers */,
- 				0C45342810CDBBFA00869157 /* JSWebGLUniformLocation.h in Headers */,
+				0C3F1F5B10C8871200D72CE1 /* WebGLUniformLocation.h in Headers */,
+				0C45342810CDBBFA00869157 /* JSWebGLUniformLocation.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp b/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
index 77875fc..3de9606 100644
--- a/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
+++ b/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
@@ -461,7 +461,7 @@ enum DataFunctionMatrixToCall {
     f_uniformMatrix2fv, f_uniformMatrix3fv, f_uniformMatrix4fv
 };
 
-bool functionForUniform(DataFunctionToCall f)
+static bool functionForUniform(DataFunctionToCall f)
 {
     switch (f) {
     case f_uniform1v:

-- 
WebKit Debian packaging