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

[jianli at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 69de4eb86108806d95d38b8bd2654679174f6a52
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 24 02:33:04 2009 +0000

    WebCore: * bindings/v8/custom/V8WebGLRenderingContextCustom.cpp:
    (WebCore::CALLBACK_FUNC_DECL):
    * platform/graphics/GraphicsContext3D.h:
    
    Reviewed by NOBODY (Chromium build fix).
    
    WebKit/chromium: * src/GraphicsContext3D.cpp:
    (WebCore::GraphicsContext3D::createShader):
    
    Reviewed by NOBODY (Chromium build fix).
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51335 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cffba1d..751b0c8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-23  Jian Li  <jianli at chromium.org>
+
+        Reviewed by NOBODY (Chromium build fix).
+
+        * bindings/v8/custom/V8WebGLRenderingContextCustom.cpp:
+        (WebCore::CALLBACK_FUNC_DECL):
+        * platform/graphics/GraphicsContext3D.h:
+
 2009-11-23  Aaron Golden  <agolden at apple.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp b/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
index b2c9f4b..6b97a7a 100644
--- a/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
@@ -123,10 +123,12 @@ CALLBACK_FUNC_DECL(WebGLRenderingContextBufferData)
     }
     if (args[1]->IsInt32()) {
         int size = toInt32(args[1]);
-        context->bufferData(target, size, usage);
+        ExceptionCode exceptionCode;
+        context->bufferData(target, size, usage, exceptionCode);
     } else if (V8WebGLArray::HasInstance(args[1])) {
         WebGLArray* array = V8DOMWrapper::convertToNativeObject<WebGLArray>(V8ClassIndex::WEBGLARRAY, args[1]->ToObject());
-        context->bufferData(target, array, usage);
+        ExceptionCode exceptionCode;
+        context->bufferData(target, array, usage, exceptionCode);
     } else {
         V8Proxy::setDOMException(SYNTAX_ERR);
         return notHandledByInterceptor();
@@ -163,7 +165,8 @@ CALLBACK_FUNC_DECL(WebGLRenderingContextBufferSubData)
         return notHandledByInterceptor();
     }
     WebGLArray* array = V8DOMWrapper::convertToNativeObject<WebGLArray>(V8ClassIndex::WEBGLARRAY, args[2]->ToObject());
-    context->bufferSubData(target, offset, array);
+    ExceptionCode exceptionCode;
+    context->bufferSubData(target, offset, array, exceptionCode);
     return v8::Undefined();
 }
 
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index 59e0c7a..b9a6db9 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -31,6 +31,11 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
 
+// FIXME: Find a better way to avoid the name confliction for NO_ERROR.
+#if PLATFORM(CHROMIUM) && PLATFORM(WIN_OS)
+#undef NO_ERROR
+#endif
+
 #if PLATFORM(MAC)
 #include <OpenGL/OpenGL.h>
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index bda7e7c..c017637 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-23  Jian Li  <jianli at chromium.org>
+
+        Reviewed by NOBODY (Chromium build fix).
+
+        * src/GraphicsContext3D.cpp:
+        (WebCore::GraphicsContext3D::createShader):
+
 2009-11-20  Jian Li  <jianli at chromium.org>
 
         Not reviewed. Fix chromium build.
diff --git a/WebKit/chromium/src/GraphicsContext3D.cpp b/WebKit/chromium/src/GraphicsContext3D.cpp
index 7bb057a..250b39c 100644
--- a/WebKit/chromium/src/GraphicsContext3D.cpp
+++ b/WebKit/chromium/src/GraphicsContext3D.cpp
@@ -1124,7 +1124,7 @@ unsigned GraphicsContext3D::createRenderbuffer()
     return o;
 }
 
-unsigned GraphicsContext3D::createShader(ShaderType type)
+unsigned GraphicsContext3D::createShader(unsigned long type)
 {
     makeContextCurrent();
     return glCreateShader((type == FRAGMENT_SHADER) ? GL_FRAGMENT_SHADER : GL_VERTEX_SHADER);

-- 
WebKit Debian packaging