[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

kbr at google.com kbr at google.com
Wed Dec 22 12:26:56 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 20150608cd16e67d5cde50d48101fc0054af935a
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 23 23:07:16 2010 +0000

    2010-08-23  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Dimitri Glazkov.
    
            Remove references to ArrayBuffer and ArrayBufferView from GraphicsContext3D
            https://bugs.webkit.org/show_bug.cgi?id=44455
    
            Updated Safari, Qt and Chromium WebGL ports to avoid referencing
            ArrayBuffer and ArrayBufferView types from GraphicsContext3D.
    
            Ran all WebGL layout tests; no new regressions. Built and tested
            WebKit on Mac OS X; built Chromium on Mac OS X and Linux.
    
            * src/GraphicsContext3D.cpp:
            (WebCore::GraphicsContext3DInternal::bufferData):
            (WebCore::GraphicsContext3DInternal::bufferSubData):
    2010-08-23  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Dimitri Glazkov.
    
            Remove references to ArrayBuffer and ArrayBufferView from GraphicsContext3D
            https://bugs.webkit.org/show_bug.cgi?id=44455
    
            Updated Safari, Qt and Chromium WebGL ports to avoid referencing
            ArrayBuffer and ArrayBufferView types from GraphicsContext3D.
    
            Ran all WebGL layout tests; no new regressions. Built and tested
            WebKit on Mac OS X; built Chromium on Mac OS X and Linux.
    
            * html/canvas/WebGLBuffer.cpp:
            * html/canvas/WebGLBuffer.h:
            * html/canvas/WebGLRenderingContext.cpp:
            (WebCore::WebGLRenderingContext::bufferData):
            (WebCore::WebGLRenderingContext::bufferSubData):
            (WebCore::WebGLRenderingContext::texImage2D):
            (WebCore::WebGLRenderingContext::texSubImage2D):
            (WebCore::WebGLRenderingContext::simulateVertexAttrib0):
            * platform/graphics/GraphicsContext3D.cpp:
            (WebCore::GraphicsContext3D::extractTextureData):
            * platform/graphics/GraphicsContext3D.h:
            * platform/graphics/chromium/GLES2Canvas.cpp:
            (WebCore::GLES2Canvas::getQuadVertices):
            * platform/graphics/mac/GraphicsContext3DMac.mm:
            (WebCore::GraphicsContext3D::bufferData):
            (WebCore::GraphicsContext3D::bufferSubData):
            * platform/graphics/qt/GraphicsContext3DQt.cpp:
            (WebCore::GraphicsContext3D::bufferData):
            (WebCore::GraphicsContext3D::bufferSubData):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65839 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1946383..4672354 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,36 @@
+2010-08-23  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Remove references to ArrayBuffer and ArrayBufferView from GraphicsContext3D
+        https://bugs.webkit.org/show_bug.cgi?id=44455
+
+        Updated Safari, Qt and Chromium WebGL ports to avoid referencing
+        ArrayBuffer and ArrayBufferView types from GraphicsContext3D.
+
+        Ran all WebGL layout tests; no new regressions. Built and tested
+        WebKit on Mac OS X; built Chromium on Mac OS X and Linux.
+
+        * html/canvas/WebGLBuffer.cpp:
+        * html/canvas/WebGLBuffer.h:
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::bufferData):
+        (WebCore::WebGLRenderingContext::bufferSubData):
+        (WebCore::WebGLRenderingContext::texImage2D):
+        (WebCore::WebGLRenderingContext::texSubImage2D):
+        (WebCore::WebGLRenderingContext::simulateVertexAttrib0):
+        * platform/graphics/GraphicsContext3D.cpp:
+        (WebCore::GraphicsContext3D::extractTextureData):
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/chromium/GLES2Canvas.cpp:
+        (WebCore::GLES2Canvas::getQuadVertices):
+        * platform/graphics/mac/GraphicsContext3DMac.mm:
+        (WebCore::GraphicsContext3D::bufferData):
+        (WebCore::GraphicsContext3D::bufferSubData):
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::bufferData):
+        (WebCore::GraphicsContext3D::bufferSubData):
+
 2010-08-20  Stephen White  <senorblanco at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/html/canvas/WebGLBuffer.cpp b/WebCore/html/canvas/WebGLBuffer.cpp
index fc98a9d..d43868d 100644
--- a/WebCore/html/canvas/WebGLBuffer.cpp
+++ b/WebCore/html/canvas/WebGLBuffer.cpp
@@ -29,6 +29,7 @@
 
 #include "WebGLBuffer.h"
 
+#include "ArrayBufferView.h"
 #include "CheckedInt.h"
 #include "WebGLRenderingContext.h"
 
diff --git a/WebCore/html/canvas/WebGLBuffer.h b/WebCore/html/canvas/WebGLBuffer.h
index a7a25b9..f18a9bf 100644
--- a/WebCore/html/canvas/WebGLBuffer.h
+++ b/WebCore/html/canvas/WebGLBuffer.h
@@ -33,6 +33,7 @@
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
+class ArrayBufferView;
 
 class WebGLBuffer : public WebGLObject {
 public:
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index 7de7893..4ee87fd 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -395,7 +395,7 @@ void WebGLRenderingContext::bufferData(unsigned long target, ArrayBuffer* data,
         return;
     }
 
-    m_context->bufferData(target, data, usage);
+    m_context->bufferData(target, data->byteLength(), data->data(), usage);
     cleanupAfterGraphicsCall(false);
 }
 
@@ -410,7 +410,7 @@ void WebGLRenderingContext::bufferData(unsigned long target, ArrayBufferView* da
         return;
     }
 
-    m_context->bufferData(target, data, usage);
+    m_context->bufferData(target, data->byteLength(), data->baseAddress(), usage);
     cleanupAfterGraphicsCall(false);
 }
 
@@ -425,7 +425,7 @@ void WebGLRenderingContext::bufferSubData(unsigned long target, long offset, Arr
         return;
     }
 
-    m_context->bufferSubData(target, offset, data);
+    m_context->bufferSubData(target, offset, data->byteLength(), data->data());
     cleanupAfterGraphicsCall(false);
 }
 
@@ -440,7 +440,7 @@ void WebGLRenderingContext::bufferSubData(unsigned long target, long offset, Arr
         return;
     }
 
-    m_context->bufferSubData(target, offset, data);
+    m_context->bufferSubData(target, offset, data->byteLength(), data->baseAddress());
     cleanupAfterGraphicsCall(false);
 }
 
@@ -2131,11 +2131,11 @@ void WebGLRenderingContext::texImage2D(unsigned target, unsigned level, unsigned
     void* data = pixels ? pixels->baseAddress() : 0;
     Vector<uint8_t> tempData;
     bool changeUnpackAlignment = false;
-    if (pixels && (m_unpackFlipY || m_unpackPremultiplyAlpha)) {
+    if (data && (m_unpackFlipY || m_unpackPremultiplyAlpha)) {
         if (!m_context->extractTextureData(width, height, format, type,
                                            m_unpackAlignment,
                                            m_unpackFlipY, m_unpackPremultiplyAlpha,
-                                           pixels,
+                                           data,
                                            tempData))
             return;
         data = tempData.data();
@@ -2300,11 +2300,11 @@ void WebGLRenderingContext::texSubImage2D(unsigned target, unsigned level, unsig
     void* data = pixels ? pixels->baseAddress() : 0;
     Vector<uint8_t> tempData;
     bool changeUnpackAlignment = false;
-    if (pixels && (m_unpackFlipY || m_unpackPremultiplyAlpha)) {
+    if (data && (m_unpackFlipY || m_unpackPremultiplyAlpha)) {
         if (!m_context->extractTextureData(width, height, format, type,
                                            m_unpackAlignment,
                                            m_unpackFlipY, m_unpackPremultiplyAlpha,
-                                           pixels,
+                                           data,
                                            tempData))
             return;
         data = tempData.data();
@@ -3547,14 +3547,14 @@ bool WebGLRenderingContext::simulateVertexAttrib0(long numVertex)
         || state.value[1] != m_vertexAttrib0BufferValue[1]
         || state.value[2] != m_vertexAttrib0BufferValue[2]
         || state.value[3] != m_vertexAttrib0BufferValue[3]) {
-        RefPtr<Float32Array> bufferData = Float32Array::create((numVertex + 1) * 4);
+        OwnArrayPtr<float> bufferData(new float[(numVertex + 1) * 4]);
         for (long ii = 0; ii < numVertex + 1; ++ii) {
-            bufferData->set(ii * 4, state.value[0]);
-            bufferData->set(ii * 4 + 1, state.value[1]);
-            bufferData->set(ii * 4 + 2, state.value[2]);
-            bufferData->set(ii * 4 + 3, state.value[3]);
+            bufferData[ii * 4] = state.value[0];
+            bufferData[ii * 4 + 1] = state.value[1];
+            bufferData[ii * 4 + 2] = state.value[2];
+            bufferData[ii * 4 + 3] = state.value[3];
         }
-        m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, bufferData.get(), GraphicsContext3D::DYNAMIC_DRAW);
+        m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, bufferDataSize, bufferData.get(), GraphicsContext3D::DYNAMIC_DRAW);
         m_vertexAttrib0BufferSize = bufferDataSize;
         m_vertexAttrib0BufferValue[0] = state.value[0];
         m_vertexAttrib0BufferValue[1] = state.value[1];
diff --git a/WebCore/platform/graphics/GraphicsContext3D.cpp b/WebCore/platform/graphics/GraphicsContext3D.cpp
index 51c4cd5..377be1c 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.cpp
+++ b/WebCore/platform/graphics/GraphicsContext3D.cpp
@@ -144,7 +144,7 @@ bool GraphicsContext3D::extractTextureData(unsigned int width, unsigned int heig
                                            unsigned int format, unsigned int type,
                                            unsigned int unpackAlignment,
                                            bool flipY, bool premultiplyAlpha,
-                                           ArrayBufferView* pixels,
+                                           const void* pixels,
                                            Vector<uint8_t>& data)
 {
     // Assumes format, type, etc. have already been validated.
@@ -193,7 +193,7 @@ bool GraphicsContext3D::extractTextureData(unsigned int width, unsigned int heig
     unsigned long bytesPerPixel = componentsPerPixel * bytesPerComponent;
     data.resize(width * height * bytesPerPixel);
 
-    if (!packPixels(static_cast<uint8_t*>(pixels->baseAddress()),
+    if (!packPixels(static_cast<const uint8_t*>(pixels),
                     sourceDataFormat,
                     width, height, unpackAlignment,
                     format, type,
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index 25d1d06..aa75fd8 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -77,15 +77,10 @@ const Platform3DObject NullPlatform3DObject = 0;
 #endif
 
 namespace WebCore {
-class ArrayBuffer;
-class ArrayBufferView;
 class CanvasRenderingContext;
-class Float32Array;
 class HostWindow;
 class Image;
 class ImageData;
-class Int32Array;
-class Uint8Array;
 class WebGLActiveInfo;
 
 struct ActiveInfo {
@@ -512,7 +507,7 @@ public:
                             unsigned int format, unsigned int type,
                             unsigned int unpackAlignment,
                             bool flipY, bool premultiplyAlpha,
-                            ArrayBufferView* pixels,
+                            const void* pixels,
                             Vector<uint8_t>& data);
 
     // Flips the given image data vertically, in-place.
@@ -556,10 +551,8 @@ public:
     void blendFuncSeparate(unsigned long srcRGB, unsigned long dstRGB, unsigned long srcAlpha, unsigned long dstAlpha);
 
     void bufferData(unsigned long target, int size, unsigned long usage);
-    void bufferData(unsigned long target, ArrayBuffer* data, unsigned long usage);
-    void bufferData(unsigned long target, ArrayBufferView* data, unsigned long usage);
-    void bufferSubData(unsigned long target, long offset, ArrayBuffer* data);
-    void bufferSubData(unsigned long target, long offset, ArrayBufferView* data);
+    void bufferData(unsigned long target, int size, const void* data, unsigned long usage);
+    void bufferSubData(unsigned long target, long offset, int size, const void* data);
 
     unsigned long checkFramebufferStatus(unsigned long target);
     void clear(unsigned long mask);
diff --git a/WebCore/platform/graphics/chromium/GLES2Canvas.cpp b/WebCore/platform/graphics/chromium/GLES2Canvas.cpp
index 24e1f98..c0cb87c 100644
--- a/WebCore/platform/graphics/chromium/GLES2Canvas.cpp
+++ b/WebCore/platform/graphics/chromium/GLES2Canvas.cpp
@@ -34,13 +34,11 @@
 
 #include "GLES2Canvas.h"
 
-#include "Float32Array.h"
 #include "FloatRect.h"
 #include "GLES2Texture.h"
 #include "GraphicsContext3D.h"
 #include "IntRect.h"
 #include "PlatformString.h"
-#include "Uint16Array.h"
 
 #define _USE_MATH_DEFINES
 #include <math.h>
@@ -350,9 +348,8 @@ unsigned GLES2Canvas::getQuadVertices()
                              0.0f, 1.0f, 1.0f,
                              1.0f, 1.0f, 1.0f };
         m_quadVertices = m_context->createBuffer();
-        RefPtr<Float32Array> vertexArray = Float32Array::create(vertices, sizeof(vertices) / sizeof(float));
         m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_quadVertices);
-        m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, vertexArray.get(), GraphicsContext3D::STATIC_DRAW);
+        m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, sizeof(vertices), vertices, GraphicsContext3D::STATIC_DRAW);
     }
     return m_quadVertices;
 }
diff --git a/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm b/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
index be1d278..69299b1 100644
--- a/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
+++ b/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
@@ -557,40 +557,16 @@ void GraphicsContext3D::bufferData(unsigned long target, int size, unsigned long
     ::glBufferData(target, size, 0, usage);
 }
 
-void GraphicsContext3D::bufferData(unsigned long target, ArrayBuffer* array, unsigned long usage)
+void GraphicsContext3D::bufferData(unsigned long target, int size, const void* data, unsigned long usage)
 {
-    if (!array || !array->byteLength())
-        return;
-    
-    ensureContext(m_contextObj);
-    ::glBufferData(target, array->byteLength(), array->data(), usage);
-}
-
-void GraphicsContext3D::bufferData(unsigned long target, ArrayBufferView* array, unsigned long usage)
-{
-    if (!array || !array->length())
-        return;
-    
     ensureContext(m_contextObj);
-    ::glBufferData(target, array->byteLength(), array->baseAddress(), usage);
+    ::glBufferData(target, size, data, usage);
 }
 
-void GraphicsContext3D::bufferSubData(unsigned long target, long offset, ArrayBuffer* array)
+void GraphicsContext3D::bufferSubData(unsigned long target, long offset, int size, const void* data)
 {
-    if (!array || !array->byteLength())
-        return;
-    
-    ensureContext(m_contextObj);
-    ::glBufferSubData(target, offset, array->byteLength(), array->data());
-}
-
-void GraphicsContext3D::bufferSubData(unsigned long target, long offset, ArrayBufferView* array)
-{
-    if (!array || !array->length())
-        return;
-    
     ensureContext(m_contextObj);
-    ::glBufferSubData(target, offset, array->byteLength(), array->baseAddress());
+    ::glBufferSubData(target, offset, size, data);
 }
 
 unsigned long GraphicsContext3D::checkFramebufferStatus(unsigned long target)
diff --git a/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp b/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
index 468de28..3ea5704 100644
--- a/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
@@ -20,18 +20,14 @@
 
 #include "GraphicsContext3D.h"
 
-#include "ArrayBufferView.h"
 #include "WebGLObject.h"
 #include "CanvasRenderingContext.h"
-#include "Float32Array.h"
 #include "GraphicsContext.h"
 #include "HTMLCanvasElement.h"
 #include "HostWindow.h"
 #include "ImageBuffer.h"
-#include "Int32Array.h"
 #include "NotImplemented.h"
 #include "QWebPageClient.h"
-#include "Uint8Array.h"
 #include <QAbstractScrollArea>
 #include <QGLContext>
 #include <wtf/UnusedParam.h>
@@ -672,40 +668,16 @@ void GraphicsContext3D::bufferData(unsigned long target, int size, unsigned long
     m_internal->bufferData(target, size, /* data */ 0, usage);
 }
 
-void GraphicsContext3D::bufferData(unsigned long target, ArrayBuffer* array, unsigned long usage)
+void GraphicsContext3D::bufferData(unsigned long target, int size, const void* data, unsigned long usage)
 {
-    if (!array || !array->byteLength())
-        return;
-
-    m_internal->m_glWidget->makeCurrent();
-    m_internal->bufferData(target, array->byteLength(), array->data(), usage);
-}
-
-void GraphicsContext3D::bufferData(unsigned long target, ArrayBufferView* array, unsigned long usage)
-{
-    if (!array || !array->length())
-        return;
-    
     m_internal->m_glWidget->makeCurrent();
-    m_internal->bufferData(target, array->byteLength(), array->baseAddress(), usage);
+    m_internal->bufferData(target, size, data, usage);
 }
 
-void GraphicsContext3D::bufferSubData(unsigned long target, long offset, ArrayBuffer* array)
+void GraphicsContext3D::bufferSubData(unsigned long target, long offset, int size, const void* data)
 {
-    if (!array || !array->byteLength())
-        return;
-
-    m_internal->m_glWidget->makeCurrent();
-    m_internal->bufferSubData(target, offset, array->byteLength(), array->data());
-}
-
-void GraphicsContext3D::bufferSubData(unsigned long target, long offset, ArrayBufferView* array)
-{
-    if (!array || !array->length())
-        return;
-    
     m_internal->m_glWidget->makeCurrent();
-    m_internal->bufferSubData(target, offset, array->byteLength(), array->baseAddress());
+    m_internal->bufferSubData(target, offset, size, data);
 }
 
 unsigned long GraphicsContext3D::checkFramebufferStatus(unsigned long target)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a2077b3..0033deb 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-23  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Remove references to ArrayBuffer and ArrayBufferView from GraphicsContext3D
+        https://bugs.webkit.org/show_bug.cgi?id=44455
+
+        Updated Safari, Qt and Chromium WebGL ports to avoid referencing
+        ArrayBuffer and ArrayBufferView types from GraphicsContext3D.
+
+        Ran all WebGL layout tests; no new regressions. Built and tested
+        WebKit on Mac OS X; built Chromium on Mac OS X and Linux.
+
+        * src/GraphicsContext3D.cpp:
+        (WebCore::GraphicsContext3DInternal::bufferData):
+        (WebCore::GraphicsContext3DInternal::bufferSubData):
+
 2010-08-23  Jian Li  <jianli at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKit/chromium/src/GraphicsContext3D.cpp b/WebKit/chromium/src/GraphicsContext3D.cpp
index 0f672a3..22e4ef6 100644
--- a/WebKit/chromium/src/GraphicsContext3D.cpp
+++ b/WebKit/chromium/src/GraphicsContext3D.cpp
@@ -39,14 +39,10 @@
 #include "CanvasRenderingContext.h"
 #include "Chrome.h"
 #include "ChromeClientImpl.h"
-#include "Float32Array.h"
 #include "HTMLCanvasElement.h"
 #include "HTMLImageElement.h"
 #include "ImageBuffer.h"
 #include "ImageData.h"
-#include "Int32Array.h"
-#include "Int8Array.h"
-#include "Uint8Array.h"
 #include "WebGraphicsContext3D.h"
 #include "WebGraphicsContext3DDefaultImpl.h"
 #include "WebKit.h"
@@ -128,10 +124,8 @@ public:
     void blendFuncSeparate(unsigned long srcRGB, unsigned long dstRGB, unsigned long srcAlpha, unsigned long dstAlpha);
 
     void bufferData(unsigned long target, int size, unsigned long usage);
-    void bufferData(unsigned long target, ArrayBuffer* data, unsigned long usage);
-    void bufferData(unsigned long target, ArrayBufferView* data, unsigned long usage);
-    void bufferSubData(unsigned long target, long offset, ArrayBuffer* data);
-    void bufferSubData(unsigned long target, long offset, ArrayBufferView* data);
+    void bufferData(unsigned long target, int size, const void* data, unsigned long usage);
+    void bufferSubData(unsigned long target, long offset, int size, const void* data);
 
     unsigned long checkFramebufferStatus(unsigned long target);
     void clear(unsigned long mask);
@@ -610,24 +604,14 @@ void GraphicsContext3DInternal::bufferData(unsigned long target, int size, unsig
     m_impl->bufferData(target, size, 0, usage);
 }
 
-void GraphicsContext3DInternal::bufferData(unsigned long target, ArrayBuffer* array, unsigned long usage)
+void GraphicsContext3DInternal::bufferData(unsigned long target, int size, const void* data, unsigned long usage)
 {
-    m_impl->bufferData(target, array->byteLength(), array->data(), usage);
+    m_impl->bufferData(target, size, data, usage);
 }
 
-void GraphicsContext3DInternal::bufferData(unsigned long target, ArrayBufferView* array, unsigned long usage)
+void GraphicsContext3DInternal::bufferSubData(unsigned long target, long offset, int size, const void* data)
 {
-    m_impl->bufferData(target, array->byteLength(), array->baseAddress(), usage);
-}
-
-void GraphicsContext3DInternal::bufferSubData(unsigned long target, long offset, ArrayBuffer* array)
-{
-    m_impl->bufferSubData(target, offset, array->byteLength(), array->data());
-}
-
-void GraphicsContext3DInternal::bufferSubData(unsigned long target, long offset, ArrayBufferView* array)
-{
-    m_impl->bufferSubData(target, offset, array->byteLength(), array->baseAddress());
+    m_impl->bufferSubData(target, offset, size, data);
 }
 
 DELEGATE_TO_IMPL_1R(checkFramebufferStatus, unsigned long, unsigned long)
@@ -1068,10 +1052,8 @@ DELEGATE_TO_INTERNAL_2(blendFunc, unsigned long, unsigned long)
 DELEGATE_TO_INTERNAL_4(blendFuncSeparate, unsigned long, unsigned long, unsigned long, unsigned long)
 
 DELEGATE_TO_INTERNAL_3(bufferData, unsigned long, int, unsigned long)
-DELEGATE_TO_INTERNAL_3(bufferData, unsigned long, ArrayBuffer*, unsigned long)
-DELEGATE_TO_INTERNAL_3(bufferData, unsigned long, ArrayBufferView*, unsigned long)
-DELEGATE_TO_INTERNAL_3(bufferSubData, unsigned long, long, ArrayBuffer*)
-DELEGATE_TO_INTERNAL_3(bufferSubData, unsigned long, long, ArrayBufferView*)
+DELEGATE_TO_INTERNAL_4(bufferData, unsigned long, int, const void*, unsigned long)
+DELEGATE_TO_INTERNAL_4(bufferSubData, unsigned long, long, int, const void*)
 
 DELEGATE_TO_INTERNAL_1R(checkFramebufferStatus, unsigned long, unsigned long)
 DELEGATE_TO_INTERNAL_1(clear, unsigned long)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list