Changeset 61910 in webkit

Timestamp:

Jun 25, 2010 3:47:09 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-25 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

getParameter(COLOR_WRITEMASK) needs to return Array
​https://bugs.webkit.org/show_bug.cgi?id=40437

• fast/canvas/webgl/gl-get-calls-expected.txt: getParameter(COLOR_WRITEMASK) returns bool array.
• fast/canvas/webgl/gl-get-calls.html: Ditto.

2010-06-25 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

getParameter(COLOR_WRITEMASK) needs to return Array
​https://bugs.webkit.org/show_bug.cgi?id=40437

• bindings/js/JSWebGLRenderingContextCustom.cpp: Handling bool array. (WebCore::toJS):
• bindings/v8/custom/V8WebGLRenderingContextCustom.cpp: Handling bool array. (WebCore::toV8Object):
• html/canvas/WebGLGetInfo.cpp: Handling bool array. (WebCore::WebGLGetInfo::WebGLGetInfo): (WebCore::WebGLGetInfo::getBoolArray):
• html/canvas/WebGLGetInfo.h: Handling bool array. (WebCore::WebGLGetInfo::):
• html/canvas/WebGLRenderingContext.cpp: Handling bool array. (WebCore::WebGLRenderingContext::getParameter): (WebCore::WebGLRenderingContext::getBooleanArrayParameter):
• html/canvas/WebGLRenderingContext.h: Handling bool array.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/gl-get-calls.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp (modified) (2 diffs)
• WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp (modified) (1 diff)
• WebCore/html/canvas/WebGLGetInfo.cpp (modified) (2 diffs)
• WebCore/html/canvas/WebGLGetInfo.h (modified) (4 diffs)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (3 diffs)
• WebCore/html/canvas/WebGLRenderingContext.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-25  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        getParameter(COLOR_WRITEMASK) needs to return Array
+        https://bugs.webkit.org/show_bug.cgi?id=40437
+
+        * fast/canvas/webgl/gl-get-calls-expected.txt: getParameter(COLOR_WRITEMASK) returns bool array.
+        * fast/canvas/webgl/gl-get-calls.html: Ditto.
+
 2010-06-25  Alpha Lam  <hclam@chromium.org>
 

trunk/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt

@@ -27 +27 @@
 PASS context.getParameter(context.BLEND_SRC_RGB) is 1
 PASS context.getParameter(context.COLOR_CLEAR_VALUE) is [0, 0, 0, 0]
-PASS context.getParameter(context.COLOR_WRITEMASK) is [1, 1, 1, 1]
+PASS context.getParameter(context.COLOR_WRITEMASK) is [true, true, true, true]
 PASS context.getParameter(context.CULL_FACE) is false
 PASS context.getParameter(context.CULL_FACE_MODE) is context.BACK

trunk/LayoutTests/fast/canvas/webgl/gl-get-calls.html

@@ -52 +52 @@
     shouldBe('context.getParameter(context.BLEND_SRC_RGB)', '1');
     shouldBe('context.getParameter(context.COLOR_CLEAR_VALUE)', '[0, 0, 0, 0]');
-    shouldBe('context.getParameter(context.COLOR_WRITEMASK)', '[1, 1, 1, 1]');
+    shouldBe('context.getParameter(context.COLOR_WRITEMASK)', '[true, true, true, true]');
     shouldBe('context.getParameter(context.CULL_FACE)', 'false');
     shouldBe('context.getParameter(context.CULL_FACE_MODE)', 'context.BACK');

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-25  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        getParameter(COLOR_WRITEMASK) needs to return Array
+        https://bugs.webkit.org/show_bug.cgi?id=40437
+
+        * bindings/js/JSWebGLRenderingContextCustom.cpp: Handling bool array.
+        (WebCore::toJS):
+        * bindings/v8/custom/V8WebGLRenderingContextCustom.cpp: Handling bool array.
+        (WebCore::toV8Object):
+        * html/canvas/WebGLGetInfo.cpp: Handling bool array.
+        (WebCore::WebGLGetInfo::WebGLGetInfo):
+        (WebCore::WebGLGetInfo::getBoolArray):
+        * html/canvas/WebGLGetInfo.h: Handling bool array.
+        (WebCore::WebGLGetInfo::):
+        * html/canvas/WebGLRenderingContext.cpp: Handling bool array.
+        (WebCore::WebGLRenderingContext::getParameter):
+        (WebCore::WebGLRenderingContext::getBooleanArrayParameter):
+        * html/canvas/WebGLRenderingContext.h: Handling bool array.
+
 2010-06-25  Evan Stade  <estade@chromium.org>
 

trunk/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp

@@ -56 +56 @@
 #include "WebGLRenderingContext.h"
 #include <runtime/Error.h>
+#include <runtime/JSArray.h>
 #include <wtf/FastMalloc.h>
 #include <wtf/OwnFastMallocPtr.h>
@@ -73 +74 @@
     case WebGLGetInfo::kTypeBool:
         return jsBoolean(info.getBool());
+    case WebGLGetInfo::kTypeBoolArray: {
+        MarkedArgumentBuffer list;
+        const Vector<bool>& value = info.getBoolArray();
+        for (size_t ii = 0; ii < value.size(); ++ii)
+            list.append(jsBoolean(value[ii]));
+        return constructArray(exec, list);
+    }
     case WebGLGetInfo::kTypeFloat:
         return jsNumber(exec, info.getFloat());

trunk/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp

@@ -111 +111 @@
     case WebGLGetInfo::kTypeBool:
         return v8::Boolean::New(info.getBool());
+    case WebGLGetInfo::kTypeBoolArray: {
+        const Vector<bool>& value = info.getBoolArray();
+        v8::Local<v8::Array> array = v8::Array::New(value.size());
+        for (size_t ii = 0; ii < value.size(); ++ii)
+            array->Set(v8::Integer::New(ii), v8::Boolean::New(value[ii]));
+        return array;
+    }
     case WebGLGetInfo::kTypeFloat:
         return v8::Number::New(info.getFloat());

trunk/WebCore/html/canvas/WebGLGetInfo.cpp

@@ -47 +47 @@
 }
 
+WebGLGetInfo::WebGLGetInfo(const bool* value, int size)
+    : m_type(kTypeBoolArray)
+{
+    if (!value || size <=0)
+        return;
+    m_boolArray.resize(size);
+    for (int ii = 0; ii < size; ++ii)
+        m_boolArray[ii] = value[ii];
+}
+
 WebGLGetInfo::WebGLGetInfo(float value)
     : m_type(kTypeFloat)
@@ -139 +149 @@
 }
 
+const Vector<bool>& WebGLGetInfo::getBoolArray() const
+{
+    ASSERT(getType() == kTypeBoolArray);
+    return m_boolArray;
+}
+
 float WebGLGetInfo::getFloat() const
 {

trunk/WebCore/html/canvas/WebGLGetInfo.h

@@ -54 +54 @@
     enum Type {
         kTypeBool,
+        kTypeBoolArray,
         kTypeFloat,
         kTypeLong,
@@ -71 +72 @@
 
     WebGLGetInfo(bool value);
+    WebGLGetInfo(const bool* value, int size);
     WebGLGetInfo(float value);
     WebGLGetInfo(long value);
@@ -93 +95 @@
 
     bool getBool() const;
+    const Vector<bool>& getBoolArray() const;
     float getFloat() const;
     long getLong() const;
@@ -111 +114 @@
     Type m_type;
     bool m_bool;
+    Vector<bool> m_boolArray;
     float m_float;
     long m_long;

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -1163 +1163 @@
         return getWebGLFloatArrayParameter(pname);
     case GraphicsContext3D::COLOR_WRITEMASK:
-        return getWebGLUnsignedByteArrayParameter(pname);
+        return getBooleanArrayParameter(pname);
     case GraphicsContext3D::COMPRESSED_TEXTURE_FORMATS:
         // Defined as null in the spec
@@ -3149 +3149 @@
 }
 
+WebGLGetInfo WebGLRenderingContext::getBooleanArrayParameter(unsigned long pname)
+{
+    if (pname != GraphicsContext3D::COLOR_WRITEMASK) {
+        notImplemented();
+        return WebGLGetInfo(0, 0);
+    }
+    unsigned char value[4] = {0};
+    m_context->getBooleanv(pname, value);
+    bool boolValue[4];
+    for (int ii = 0; ii < 4; ++ii)
+        boolValue[ii] = static_cast<bool>(value[ii]);
+    return WebGLGetInfo(boolValue, 4);
+}
+
 WebGLGetInfo WebGLRenderingContext::getFloatParameter(unsigned long pname)
 {
@@ -3213 +3227 @@
     }
     return WebGLGetInfo(Int32Array::create(value, length));
-}
-
-WebGLGetInfo WebGLRenderingContext::getWebGLUnsignedByteArrayParameter(unsigned long pname)
-{
-    unsigned char value[4] = {0};
-    m_context->getBooleanv(pname, value);
-    unsigned length = 0;
-    switch (pname) {
-    case GraphicsContext3D::COLOR_WRITEMASK:
-        length = 4;
-        break;
-    default:
-        notImplemented();
-    }
-    return WebGLGetInfo(Uint8Array::create(value, length));
 }
 

trunk/WebCore/html/canvas/WebGLRenderingContext.h

@@ -390 +390 @@
         // Helpers for getParameter and others
         WebGLGetInfo getBooleanParameter(unsigned long pname);
+        WebGLGetInfo getBooleanArrayParameter(unsigned long pname);
         WebGLGetInfo getFloatParameter(unsigned long pname);
         WebGLGetInfo getIntParameter(unsigned long pname);
@@ -396 +397 @@
         WebGLGetInfo getWebGLFloatArrayParameter(unsigned long pname);
         WebGLGetInfo getWebGLIntArrayParameter(unsigned long pname);
-        WebGLGetInfo getWebGLUnsignedByteArrayParameter(unsigned long pname);
 
         void texImage2DBase(unsigned target, unsigned level, unsigned internalformat,