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

[oliver at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit ea171bc8e1798d04d6a7001e722bad8a1b21d6a3
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 10 10:20:52 2009 +0000

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6c95e27..84f5a93 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-10  Oliver Hunt  <oliver at apple.com>
+
+        Chrome build fix.
+
+        * bindings/v8/V8Index.h:
+
 2009-11-10  Joanmarie Diggs  <joanmarie.diggs at gmail.com>
 
         Reviewed by Reviewed by Jan Alonzo.
diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h
index 3aa392d..441f46d 100644
--- a/WebCore/bindings/v8/V8Index.h
+++ b/WebCore/bindings/v8/V8Index.h
@@ -445,23 +445,23 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
 
 #if ENABLE(3D_CANVAS)
 #define DOM_OBJECT_3D_CANVAS_TYPES(V)                                   \
-    V(CANVASACTIVEINFO, WebGLActiveInfo)                               \
-    V(CANVASARRAY, WebGLArray)                                         \
-    V(CANVASARRAYBUFFER, WebGLArrayBuffer)                             \
-    V(CANVASBUFFER, WebGLBuffer)                                       \
-    V(CANVASBYTEARRAY, WebGLByteArray)                                 \
-    V(CANVASFLOATARRAY, WebGLFloatArray)                               \
-    V(CANVASFRAMEBUFFER, WebGLFramebuffer)                             \
-    V(CANVASINTARRAY, WebGLIntArray)                                   \
-    V(CANVASPROGRAM, WebGLProgram)                                     \
-    V(CANVASRENDERBUFFER, WebGLRenderbuffer)                           \
-    V(CANVASRENDERINGCONTEXT3D, WebGLRenderingContext)               \
-    V(CANVASSHADER, WebGLShader)                                       \
-    V(CANVASSHORTARRAY, WebGLShortArray)                               \
-    V(CANVASTEXTURE, WebGLTexture)                                     \
-    V(CANVASUNSIGNEDBYTEARRAY, WebGLUnsignedByteArray)                 \
-    V(CANVASUNSIGNEDINTARRAY, WebGLUnsignedIntArray)                   \
-    V(CANVASUNSIGNEDSHORTARRAY, WebGLUnsignedShortArray)
+    V(WEBGLACTIVEINFO, WebGLActiveInfo)                                 \
+    V(WEBGLARRAY, WebGLArray)                                           \
+    V(WEBGLARRAYBUFFER, WebGLArrayBuffer)                               \
+    V(WEBGLBUFFER, WebGLBuffer)                                         \
+    V(WEBGLBYTEARRAY, WebGLByteArray)                                   \
+    V(WEBGLFLOATARRAY, WebGLFloatArray)                                 \
+    V(WEBGLFRAMEBUFFER, WebGLFramebuffer)                               \
+    V(WEBGLINTARRAY, WebGLIntArray)                                     \
+    V(WEBGLPROGRAM, WebGLProgram)                                       \
+    V(WEBGLRENDERBUFFER, WebGLRenderbuffer)                             \
+    V(WEBGLRENDERINGCONTEXT, WebGLRenderingContext)                     \
+    V(WEBGLSHADER, WebGLShader)                                         \
+    V(WEBGLSHORTARRAY, WebGLShortArray)                                 \
+    V(WEBGLTEXTURE, WebGLTexture)                                       \
+    V(WEBGLUNSIGNEDBYTEARRAY, WebGLUnsignedByteArray)                   \
+    V(WEBGLUNSIGNEDINTARRAY, WebGLUnsignedIntArray)                     \
+    V(WEBGLUNSIGNEDSHORTARRAY, WebGLUnsignedShortArray)
 #else
 #define DOM_OBJECT_3D_CANVAS_TYPES(V)
 #endif

-- 
WebKit Debian packaging