diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-24 13:09:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-24 13:09:44 +0200 |
| commit | dc6262b587c71c14e30d93e57ed812e36a79a33e (patch) | |
| tree | 03ff986e7aa38bba0c0ef374f44fda52aff93f01 /Source/JavaScriptCore/runtime/ClassInfo.h | |
| parent | 02e1fbbefd49229b102ef107bd70ce974a2d85fb (diff) | |
| download | qtwebkit-dc6262b587c71c14e30d93e57ed812e36a79a33e.tar.gz | |
Imported WebKit commit 6339232fec7f5d9984a33388aecfd2cbc7832053 (http://svn.webkit.org/repository/webkit/trunk@129343)
New snapshot with build fixes for latest qtbase
Diffstat (limited to 'Source/JavaScriptCore/runtime/ClassInfo.h')
| -rw-r--r-- | Source/JavaScriptCore/runtime/ClassInfo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/runtime/ClassInfo.h b/Source/JavaScriptCore/runtime/ClassInfo.h index 0e1747b24..e8823d571 100644 --- a/Source/JavaScriptCore/runtime/ClassInfo.h +++ b/Source/JavaScriptCore/runtime/ClassInfo.h @@ -81,8 +81,8 @@ namespace JSC { typedef String (*ClassNameFunctionPtr)(const JSObject*); ClassNameFunctionPtr className; - typedef bool (*HasInstanceFunctionPtr)(JSObject*, ExecState*, JSValue, JSValue); - HasInstanceFunctionPtr hasInstance; + typedef bool (*CustomHasInstanceFunctionPtr)(JSObject*, ExecState*, JSValue); + CustomHasInstanceFunctionPtr customHasInstance; typedef void (*PutWithAttributesFunctionPtr)(JSObject*, ExecState*, PropertyName propertyName, JSValue, unsigned attributes); PutWithAttributesFunctionPtr putDirectVirtual; @@ -130,7 +130,7 @@ struct MemberCheck##member { \ &ClassName::getOwnNonIndexPropertyNames, \ &ClassName::getPropertyNames, \ &ClassName::className, \ - &ClassName::hasInstance, \ + &ClassName::customHasInstance, \ &ClassName::putDirectVirtual, \ &ClassName::defineOwnProperty, \ &ClassName::getOwnPropertyDescriptor, \ |