Changeset 73119 in webkit

Timestamp:

Dec 2, 2010 2:40:07 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-02 Yuqiang Xian <​yuqiang.xian@intel.com>

Reviewed by Pavel Feldman.

[V8] Speed up data property access for ImageData.
​https://bugs.webkit.org/show_bug.cgi?id=49999

We create a normal V8 object which has a PixelArray as the backing storage,
and set the "data" property of the ImageData object to it.
This way "data" becomes a pure JS property and we don't need to call through
the C++ bindings for ImageData "data" access.
This eliminates big overhead in switching between JavaScript and native
contexts and performing object bindings.

No new tests. Relying on existing Canvas tests.

• WebCore.gypi:
• bindings/scripts/CodeGeneratorV8.pm:
• bindings/v8/custom/V8CanvasPixelArrayCustom.cpp: (WebCore::toV8):
• bindings/v8/custom/V8ImageDataCustom.cpp: Added. (WebCore::toV8):
• html/ImageData.idl:
• html/canvas/CanvasPixelArray.idl:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• bindings/scripts/CodeGeneratorV8.pm (modified) (1 diff)
• bindings/v8/custom/V8CanvasPixelArrayCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8ImageDataCustom.cpp (copied) (copied from trunk/WebCore/bindings/v8/custom/V8CanvasPixelArrayCustom.cpp) (1 diff)
• html/ImageData.idl (modified) (1 diff)
• html/canvas/CanvasPixelArray.idl (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-02  Yuqiang Xian  <yuqiang.xian@intel.com>
+
+        Reviewed by Pavel Feldman.
+
+        [V8] Speed up data property access for ImageData.
+        https://bugs.webkit.org/show_bug.cgi?id=49999
+
+        We create a normal V8 object which has a PixelArray as the backing storage,
+        and set the "data" property of the ImageData object to it. 
+        This way "data" becomes a pure JS property and we don't need to call through
+        the C++ bindings for ImageData "data" access. 
+        This eliminates big overhead in switching between JavaScript and native
+        contexts and performing object bindings.
+
+        No new tests. Relying on existing Canvas tests.
+
+        * WebCore.gypi:
+        * bindings/scripts/CodeGeneratorV8.pm:
+        * bindings/v8/custom/V8CanvasPixelArrayCustom.cpp:
+        (WebCore::toV8):
+        * bindings/v8/custom/V8ImageDataCustom.cpp: Added.
+        (WebCore::toV8):
+        * html/ImageData.idl:
+        * html/canvas/CanvasPixelArray.idl:
+
 2010-12-02  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/WebCore.gypi

@@ -748 +748 @@
             'bindings/v8/OptionsObject.cpp',
             'bindings/v8/OptionsObject.h',
+            'bindings/v8/custom/V8ImageDataCustom.cpp',
             'bindings/v8/custom/V8CanvasPixelArrayCustom.cpp',
             'bindings/v8/custom/V8ArrayBufferViewCustom.h',

trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -2529 +2529 @@
     return 0 if $interfaceName eq "AbstractWorker";
     return 0 if $interfaceName eq "CanvasRenderingContext";
-    return 0 if $interfaceName eq "ImageData";
     return 0 if $interfaceName eq "SVGElementInstance";
 

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

@@ -39 +39 @@
         return v8::Null();
     v8::Handle<v8::Object> wrapper = V8CanvasPixelArray::wrap(impl);
-    if (!wrapper.IsEmpty())
+    if (!wrapper.IsEmpty()) {
         wrapper->SetIndexedPropertiesToPixelData(impl->data()->data(), impl->length());
+        wrapper->Set(v8::String::NewSymbol("length"),
+                     v8::Integer::New(impl->length()),
+                     v8::ReadOnly);
+    }
     return wrapper;
 }

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

@@ -30 +30 @@
 
 #include "config.h"
+#include "V8ImageData.h"
+
 #include "V8CanvasPixelArray.h"
 
 namespace WebCore {
 
-v8::Handle<v8::Value> toV8(CanvasPixelArray* impl)
+v8::Handle<v8::Value> toV8(ImageData* impl)
 {
     if (!impl)
         return v8::Null();
-    v8::Handle<v8::Object> wrapper = V8CanvasPixelArray::wrap(impl);
-    if (!wrapper.IsEmpty())
-        wrapper->SetIndexedPropertiesToPixelData(impl->data()->data(), impl->length());
+    v8::Handle<v8::Object> wrapper = V8ImageData::wrap(impl);
+    if (!wrapper.IsEmpty()) {
+        // Create a V8 CanvasPixelArray object.
+        v8::Handle<v8::Value> pixelArray = toV8(impl->data());
+        // Set the "data" property of the ImageData object to
+        // the created v8 object, eliminating the C++ callback
+        // when accessing the "data" property.
+        if (!pixelArray.IsEmpty()) {
+            wrapper->Set(v8::String::NewSymbol("data"),
+                         pixelArray,
+                         v8::ReadOnly);
+        }
+    }
+
     return wrapper;
 }

trunk/WebCore/html/ImageData.idl

@@ -34 +34 @@
         readonly attribute long width;
         readonly attribute long height;
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT || defined(V8_BINDING) && V8_BINDING
+#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
         readonly attribute CanvasPixelArray data;
 #endif

trunk/WebCore/html/canvas/CanvasPixelArray.idl

@@ -35 +35 @@
         HasCustomIndexSetter
     ] CanvasPixelArray {
+#if !defined(V8_BINDING) || !V8_BINDING
         readonly attribute long length;
+#endif
     };
 #endif