Changeset 440 for trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

Timestamp:

08/18/08 11:14:49 (5 months ago)

Author:

odole

Message:

merge with webkit revision 35814

Files:

• trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h (modified) (24 diffs)

trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -34 +34 @@
-#include "JSString.h"
-#include "JSStringRef.h"
+#include "OpaqueJSString.h"
-#include "PropertyNameArray.h"
-#include <wtf/Vector.h>
@@ -42 +43 @@
-JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, JSClassRef jsClass, JSValue* prototype, void* data)
-    : Base(prototype)
-
-
+
-{
-    init(exec);
@@ -52 +52 @@
-template <class Base>
-JSCallbackObject<Base>::JSCallbackObject(JSClassRef jsClass)
-
-
+
-{
-    ASSERT(Base::isGlobalObject());
@@ -65 +64 @@
-    
-    Vector<JSObjectInitializeCallback, 16> initRoutines;
-m_class
+classRef()
-    do {
-        if (JSObjectInitializeCallback initialize = jsClass->initialize)
@@ -83 +82 @@
-    JSObjectRef thisRef = toRef(this);
-    
-m_class
- {
+classRef()
+
-            finalize(thisRef);
-        }
-            
-    JSClassRelease(m_class);
-}
-
@@ -94 +90 @@
-UString JSCallbackObject<Base>::className() const
-{
-m_class
+classRef()
-    if (!thisClassName.isNull())
-        return thisClassName;
@@ -106 +102 @@
-    JSContextRef ctx = toRef(exec);
-    JSObjectRef thisRef = toRef(this);
-JSStringRef propertyNameRef = toRef(propertyName.ustring().rep())
-
-m_class
+RefPtr<OpaqueJSString> propertyNameRef
+
+classRef()
-        // optional optimization to bypass getProperty in cases when we only need to know if the property exists
-        if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {
-
+
+
+
-                slot.setCustom(this, callbackGetter);
-                return true;
-            }
-        } else if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
-
+
+
+
-                // cache the value so we don't have to compute it again
-                // FIXME: This violates the PropertySlot design a little bit.
@@ -154 +154 @@
-    JSContextRef ctx = toRef(exec);
-    JSObjectRef thisRef = toRef(this);
-JSStringRef propertyNameRef = toRef(propertyName.ustring().rep())
+RefPtr<OpaqueJSString> propertyNameRef
-    JSValueRef valueRef = toRef(value);
-    
-m_class
+classRef()
-        if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
-
+
+
+
-                return;
-        }
@@ -168 +170 @@
-                    return;
-                if (JSObjectSetPropertyCallback setProperty = entry->setProperty) {
-
+
+
+
-                        return;
-                } else
@@ -199 +203 @@
-    JSContextRef ctx = toRef(exec);
-    JSObjectRef thisRef = toRef(this);
-JSStringRef propertyNameRef = toRef(propertyName.ustring().rep())
-
-m_class
+RefPtr<OpaqueJSString> propertyNameRef
+
+classRef()
-        if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {
-
+
+
+
-                return true;
-        }
@@ -236 +242 @@
-ConstructType JSCallbackObject<Base>::getConstructData(ConstructData& constructData)
-{
-m_class
+classRef()
-        if (jsClass->callAsConstructor) {
-            constructData.native.function = construct;
@@ -268 +274 @@
-bool JSCallbackObject<Base>::implementsHasInstance() const
-{
-m_class
+classRef()
-        if (jsClass->hasInstance)
-            return true;
@@ -281 +287 @@
-    JSObjectRef thisRef = toRef(this);
-    
-m_class
+classRef()
-        if (JSObjectHasInstanceCallback hasInstance = jsClass->hasInstance)
-            return hasInstance(execRef, thisRef, toRef(value), toRef(exec->exceptionSlot()));
@@ -292 +298 @@
-CallType JSCallbackObject<Base>::getCallData(CallData& callData)
-{
-m_class
+classRef()
-        if (jsClass->callAsFunction) {
-            callData.native.function = call;
@@ -308 +314 @@
-    JSObjectRef thisObjRef = toRef(thisValue->toThisObject(exec));
-    
-m_class
+classRef()
-        if (JSObjectCallAsFunctionCallback callAsFunction = jsClass->callAsFunction) {
-            int argumentCount = static_cast<int>(args.size());
@@ -328 +334 @@
-    JSObjectRef thisRef = toRef(this);
-    
-m_class
+classRef()
-        if (JSObjectGetPropertyNamesCallback getPropertyNames = jsClass->getPropertyNames)
-            getPropertyNames(execRef, thisRef, toRef(&propertyNames));
@@ -369 +375 @@
-    JSObjectRef thisRef = toRef(this);
-    
-m_class
+classRef()
-        if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType) {
-            if (JSValueRef value = convertToType(ctx, thisRef, kJSTypeNumber, toRef(exec->exceptionSlot())))
@@ -384 +390 @@
-    JSObjectRef thisRef = toRef(this);
-    
-m_class
+classRef()
-        if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType) {
-            JSValueRef value = convertToType(ctx, thisRef, kJSTypeString, toRef(exec->exceptionSlot()));
@@ -397 +403 @@
-void JSCallbackObject<Base>::setPrivate(void* data)
-{
-
+callbackObjectData->
-}
-
@@ -403 +409 @@
-void* JSCallbackObject<Base>::getPrivate()
-{
-
+callbackObjectData->
-}
-
@@ -409 +415 @@
-bool JSCallbackObject<Base>::inherits(JSClassRef c) const
-{
-m_class
+classRef()
-        if (jsClass == c)
-            return true;
@@ -431 +437 @@
-    
-    JSObjectRef thisRef = toRef(thisObj);
-JSStringRef propertyNameRef = toRef(propertyName.ustring().rep())
-
-m_class
+RefPtr<OpaqueJSString> propertyNameRef
+
+classRef()
-        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec))
-            if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep()))
-                if (JSObjectGetPropertyCallback getProperty = entry->getProperty) {
-
+
+
+
-                        return toJS(value);
-                }
@@ -455 +463 @@
-        return slot2.getValue(exec, propertyName);
-    
-m_class
+classRef()
-        if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
-            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
@@ -477 +485 @@
-    
-    JSObjectRef thisRef = toRef(thisObj);
-JSStringRef propertyNameRef = toRef(propertyName.ustring().rep())
-
-m_class
+RefPtr<OpaqueJSString> propertyNameRef
+
+classRef()
-        if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
-
+
+
+
-                return toJS(value);
-        }