Title: [111388] trunk
Revision
111388
Author
[email protected]
Date
2012-03-20 05:57:04 -0700 (Tue, 20 Mar 2012)

Log Message

Web Inspector: treat Uint* external arrays as arrays in console.
https://bugs.webkit.org/show_bug.cgi?id=81653

Reviewed by Yury Semikhatsky.

Source/WebCore:

* bindings/js/JSInjectedScriptHostCustom.cpp:
(WebCore::JSInjectedScriptHost::type):
* bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
(WebCore::V8InjectedScriptHost::typeCallback):

LayoutTests:

* inspector/console/console-external-array-expected.txt:
* inspector/console/console-external-array.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (111387 => 111388)


--- trunk/LayoutTests/ChangeLog	2012-03-20 12:38:45 UTC (rev 111387)
+++ trunk/LayoutTests/ChangeLog	2012-03-20 12:57:04 UTC (rev 111388)
@@ -1,3 +1,13 @@
+2012-03-20  Pavel Feldman  <[email protected]>
+
+        Web Inspector: treat Uint* external arrays as arrays in console.
+        https://bugs.webkit.org/show_bug.cgi?id=81653
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/console/console-external-array-expected.txt:
+        * inspector/console/console-external-array.html:
+
 2012-03-20  Andreas Kling  <[email protected]>
 
         Let CSSImageValue inherit directly from CSSValue.

Modified: trunk/LayoutTests/inspector/console/console-external-array-expected.txt (111387 => 111388)


--- trunk/LayoutTests/inspector/console/console-external-array-expected.txt	2012-03-20 12:38:45 UTC (rev 111387)
+++ trunk/LayoutTests/inspector/console/console-external-array-expected.txt	2012-03-20 12:57:04 UTC (rev 111388)
@@ -1,13 +1,19 @@
 CONSOLE MESSAGE: line 9: [object Int8Array]
 CONSOLE MESSAGE: line 10: [object Int16Array]
 CONSOLE MESSAGE: line 11: [object Int32Array]
-CONSOLE MESSAGE: line 12: [object Float32Array]
-CONSOLE MESSAGE: line 13: [object Float64Array]
-CONSOLE MESSAGE: line 15: [object Int8Array]
-CONSOLE MESSAGE: line 16: [object Int16Array]
-CONSOLE MESSAGE: line 17: [object Int32Array]
-CONSOLE MESSAGE: line 18: [object Float32Array]
-CONSOLE MESSAGE: line 19: [object Float64Array]
+CONSOLE MESSAGE: line 12: [object Uint8Array]
+CONSOLE MESSAGE: line 13: [object Uint16Array]
+CONSOLE MESSAGE: line 14: [object Uint32Array]
+CONSOLE MESSAGE: line 15: [object Float32Array]
+CONSOLE MESSAGE: line 16: [object Float64Array]
+CONSOLE MESSAGE: line 18: [object Int8Array]
+CONSOLE MESSAGE: line 19: [object Int16Array]
+CONSOLE MESSAGE: line 20: [object Int32Array]
+CONSOLE MESSAGE: line 21: [object Uint8Array]
+CONSOLE MESSAGE: line 22: [object Uint16Array]
+CONSOLE MESSAGE: line 23: [object Uint32Array]
+CONSOLE MESSAGE: line 24: [object Float32Array]
+CONSOLE MESSAGE: line 25: [object Float64Array]
 Tests that console logging detects external arrays as arrays.
 
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0] console-external-array.html:9
@@ -15,9 +21,15 @@
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0] console-external-array.html:11
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0] console-external-array.html:12
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0] console-external-array.html:13
-Int8Array[10] console-external-array.html:15
-Int16Array[10] console-external-array.html:16
-Int32Array[10] console-external-array.html:17
-Float32Array[10] console-external-array.html:18
-Float64Array[10] console-external-array.html:19
+[0, 0, 0, 0, 0, 0, 0, 0, 0, 0] console-external-array.html:14
+[0, 0, 0, 0, 0, 0, 0, 0, 0, 0] console-external-array.html:15
+[0, 0, 0, 0, 0, 0, 0, 0, 0, 0] console-external-array.html:16
+Int8Array[10] console-external-array.html:18
+Int16Array[10] console-external-array.html:19
+Int32Array[10] console-external-array.html:20
+Uint8Array[10] console-external-array.html:21
+Uint16Array[10] console-external-array.html:22
+Uint32Array[10] console-external-array.html:23
+Float32Array[10] console-external-array.html:24
+Float64Array[10] console-external-array.html:25
 

Modified: trunk/LayoutTests/inspector/console/console-external-array.html (111387 => 111388)


--- trunk/LayoutTests/inspector/console/console-external-array.html	2012-03-20 12:38:45 UTC (rev 111387)
+++ trunk/LayoutTests/inspector/console/console-external-array.html	2012-03-20 12:57:04 UTC (rev 111388)
@@ -9,12 +9,18 @@
     console.log(new Int8Array(10));
     console.log(new Int16Array(10));
     console.log(new Int32Array(10));
+    console.log(new Uint8Array(10));
+    console.log(new Uint16Array(10));
+    console.log(new Uint32Array(10));
     console.log(new Float32Array(10));
     console.log(new Float64Array(10));
 
     console.dir(new Int8Array(10));
     console.dir(new Int16Array(10));
     console.dir(new Int32Array(10));
+    console.dir(new Uint8Array(10));
+    console.dir(new Uint16Array(10));
+    console.dir(new Uint32Array(10));
     console.dir(new Float32Array(10));
     console.dir(new Float64Array(10));
 

Modified: trunk/Source/WebCore/ChangeLog (111387 => 111388)


--- trunk/Source/WebCore/ChangeLog	2012-03-20 12:38:45 UTC (rev 111387)
+++ trunk/Source/WebCore/ChangeLog	2012-03-20 12:57:04 UTC (rev 111388)
@@ -1,3 +1,15 @@
+2012-03-20  Pavel Feldman  <[email protected]>
+
+        Web Inspector: treat Uint* external arrays as arrays in console.
+        https://bugs.webkit.org/show_bug.cgi?id=81653
+
+        Reviewed by Yury Semikhatsky.
+
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        (WebCore::JSInjectedScriptHost::type):
+        * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
+        (WebCore::V8InjectedScriptHost::typeCallback):
+
 2012-03-20  Andreas Kling  <[email protected]>
 
         Let CSSImageValue inherit directly from CSSValue.

Modified: trunk/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp (111387 => 111388)


--- trunk/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp	2012-03-20 12:38:45 UTC (rev 111387)
+++ trunk/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp	2012-03-20 12:57:04 UTC (rev 111388)
@@ -54,6 +54,9 @@
 #include "JSNode.h"
 #include "JSNodeList.h"
 #include "JSStorage.h"
+#include "JSUint16Array.h"
+#include "JSUint32Array.h"
+#include "JSUint8Array.h"
 #include "ScriptValue.h"
 #include "Storage.h"
 #include <parser/SourceCode.h>
@@ -143,6 +146,8 @@
         return jsString(exec, String("array"));
     if (value.inherits(&JSInt8Array::s_info) || value.inherits(&JSInt16Array::s_info) || value.inherits(&JSInt32Array::s_info))
         return jsString(exec, String("array"));
+    if (value.inherits(&JSUint8Array::s_info) || value.inherits(&JSUint16Array::s_info) || value.inherits(&JSUint32Array::s_info))
+        return jsString(exec, String("array"));
     if (value.inherits(&JSFloat32Array::s_info) || value.inherits(&JSFloat64Array::s_info))
         return jsString(exec, String("array"));
     return jsUndefined();

Modified: trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp (111387 => 111388)


--- trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp	2012-03-20 12:38:45 UTC (rev 111387)
+++ trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp	2012-03-20 12:57:04 UTC (rev 111388)
@@ -52,6 +52,9 @@
 #include "V8Node.h"
 #include "V8Proxy.h"
 #include "V8Storage.h"
+#include "V8Uint16Array.h"
+#include "V8Uint32Array.h"
+#include "V8Uint8Array.h"
 
 namespace WebCore {
 
@@ -139,6 +142,8 @@
         return v8::String::New("array");
     if (V8Int8Array::HasInstance(value) || V8Int16Array::HasInstance(value) || V8Int32Array::HasInstance(value))
         return v8::String::New("array");
+    if (V8Uint8Array::HasInstance(value) || V8Uint16Array::HasInstance(value) || V8Uint32Array::HasInstance(value))
+        return v8::String::New("array");
     if (V8Float32Array::HasInstance(value) || V8Float64Array::HasInstance(value))
         return v8::String::New("array");
     return v8::Undefined();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to