Changeset 74760 in webkit

Timestamp:

Dec 29, 2010 2:20:51 PM (13 years ago)

Author:

Martin Robinson

Message:

2010-12-29 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Sam Weinig.

JSDataViewCustom.cpp gives the fastcall calling convention to functions called via C++
​https://bugs.webkit.org/show_bug.cgi?id=51722

Remove the JSC_HOST_CALL from methods that are called from C++. JSC_HOST_CALL gives
methods the fastcall calling convention, which leads to runtime errors when they are
called from C++. Also remove a bit of unnecessary code duplication.

No new tests. This is covered by fast/canvas/webgl/data-view-test.html.

• bindings/js/JSDataViewCustom.cpp: (WebCore::getDataViewMember): Remove duplicated code. (WebCore::JSDataView::getInt8): Remove JSC_HOST_CALL. (WebCore::JSDataView::getUint8): Ditto. (WebCore::JSDataView::getFloat32): Ditto. (WebCore::JSDataView::getFloat64): Ditto. (WebCore::setDataViewMember): Remove duplicated code. (WebCore::JSDataView::setInt8): Remove JSC_HOST_CALL. (WebCore::JSDataView::setUint8): Ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDataViewCustom.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-29  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Sam Weinig.
+
+        JSDataViewCustom.cpp gives the fastcall calling convention to functions called via C++
+        https://bugs.webkit.org/show_bug.cgi?id=51722
+
+        Remove the JSC_HOST_CALL from methods that are called from C++. JSC_HOST_CALL gives
+        methods the fastcall calling convention, which leads to runtime errors when they are
+        called from C++. Also remove a bit of unnecessary code duplication.
+
+        No new tests. This is covered by fast/canvas/webgl/data-view-test.html.
+
+        * bindings/js/JSDataViewCustom.cpp:
+        (WebCore::getDataViewMember): Remove duplicated code.
+        (WebCore::JSDataView::getInt8): Remove JSC_HOST_CALL.
+        (WebCore::JSDataView::getUint8): Ditto.
+        (WebCore::JSDataView::getFloat32): Ditto.
+        (WebCore::JSDataView::getFloat64): Ditto.
+        (WebCore::setDataViewMember): Remove duplicated code.
+        (WebCore::JSDataView::setInt8): Remove JSC_HOST_CALL.
+        (WebCore::JSDataView::setUint8): Ditto.
+
 2010-12-29  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/bindings/js/JSDataViewCustom.cpp

@@ -66 +66 @@
 }
 
-static JSValue getDataViewMember(ExecState* exec, DataViewAccessType type)
+static JSValue getDataViewMember(ExecState* exec, DataView* imp, DataViewAccessType type)
 {
-    JSValue thisValue = exec->hostThisValue();
-    if (!thisValue.inherits(&JSDataView::s_info))
-        return throwTypeError(exec);
-    JSDataView* castedThis = static_cast<JSDataView*>(asObject(thisValue));
-    DataView* imp = static_cast<DataView*>(castedThis->impl());
     if (exec->argumentCount() < 1)
         return throwError(exec, createSyntaxError(exec, "Not enough arguments"));
@@ -108 +103 @@
 }
 
-JSValue JSC_HOST_CALL JSDataView::getInt8(ExecState* exec)
+JSValue JSDataView::getInt8(ExecState* exec)
 {
-    return getDataViewMember(exec, AccessDataViewMemberAsInt8);
+    return getDataViewMember(exec, static_cast<DataView*>(impl()), AccessDataViewMemberAsInt8);
 }
 
-JSValue JSC_HOST_CALL JSDataView::getUint8(ExecState* exec)
+JSValue JSDataView::getUint8(ExecState* exec)
 {
-    return getDataViewMember(exec, AccessDataViewMemberAsUint8);
+    return getDataViewMember(exec, static_cast<DataView*>(impl()), AccessDataViewMemberAsUint8);
 }
 
-JSValue JSC_HOST_CALL JSDataView::getFloat32(ExecState* exec)
+JSValue JSDataView::getFloat32(ExecState* exec)
 {
-    return getDataViewMember(exec, AccessDataViewMemberAsFloat32);
+    return getDataViewMember(exec, static_cast<DataView*>(impl()), AccessDataViewMemberAsFloat32);
 }
 
-JSValue JSC_HOST_CALL JSDataView::getFloat64(ExecState* exec)
+JSValue JSDataView::getFloat64(ExecState* exec)
 {
-    return getDataViewMember(exec, AccessDataViewMemberAsFloat64);
+    return getDataViewMember(exec, static_cast<DataView*>(impl()), AccessDataViewMemberAsFloat64);
 }
 
-static JSValue setDataViewMember(ExecState* exec, DataViewAccessType type)
+static JSValue setDataViewMember(ExecState* exec, DataView* imp, DataViewAccessType type)
 {
-    JSValue thisValue = exec->hostThisValue();
-    if (!thisValue.inherits(&JSDataView::s_info))
-        return throwTypeError(exec);
-    JSDataView* castedThis = static_cast<JSDataView*>(asObject(thisValue));
-    DataView* imp = static_cast<DataView*>(castedThis->impl());
     if (exec->argumentCount() < 2)
         return throwError(exec, createSyntaxError(exec, "Not enough arguments"));
@@ -160 +150 @@
 }
 
-JSValue JSC_HOST_CALL JSDataView::setInt8(ExecState* exec)
+JSValue JSDataView::setInt8(ExecState* exec)
 {
-    return setDataViewMember(exec, AccessDataViewMemberAsInt8);
+    return setDataViewMember(exec, static_cast<DataView*>(impl()), AccessDataViewMemberAsInt8);
 }
 
-JSValue JSC_HOST_CALL JSDataView::setUint8(ExecState* exec)
+JSValue JSDataView::setUint8(ExecState* exec)
 {
-    return setDataViewMember(exec, AccessDataViewMemberAsUint8);
+    return setDataViewMember(exec, static_cast<DataView*>(impl()), AccessDataViewMemberAsUint8);
 }