Changeset 15480 in webkit for trunk/JavaScriptCore/API/JSCallbackObject.cpp

Timestamp:

Jul 16, 2006, 9:41:01 PM (19 years ago)

Author:

ggaren

Message:

Approved by Maciej, RS by Beth.

JSObjectMakeFunction -> JSObjectMakeFunctionWithCallback
JSObjectMakeFunctionWithBody -> JSObjectMakeFunction

because the latter is more common, and more fundamental, than the former.

• API/APICast.h: (toJS):
• API/JSBase.h:
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::deleteProperty): (KJS::JSCallbackObject::getPropertyNames): (KJS::JSCallbackObject::staticValueGetter): (KJS::JSCallbackObject::staticFunctionGetter):
• API/JSClassRef.cpp: (OpaqueJSClass::OpaqueJSClass): (OpaqueJSClass::~OpaqueJSClass):
• API/JSClassRef.h:
• API/JSObjectRef.cpp: (JSClassCreate): (JSObjectMakeFunctionWithCallback): (JSObjectMakeFunction): (OpaqueJSPropertyNameArray::OpaqueJSPropertyNameArray): (JSObjectCopyPropertyNames):
• API/JSObjectRef.h:
• API/minidom.c: (main):
• API/testapi.c: (main):
• ChangeLog:
• JavaScriptCore.exp:

File:

• trunk/JavaScriptCore/API/JSCallbackObject.cpp (modified) (10 diffs)

trunk/JavaScriptCore/API/JSCallbackObject.cpp

@@ -107 +107 @@
         }
 
-        if (__JSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
+        if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
             if (staticValues->contains(propertyName.ustring().rep())) {
                 slot.setCustom(this, staticValueGetter);
@@ -114 +114 @@
         }
         
-        if (__JSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
+        if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
             if (staticFunctions->contains(propertyName.ustring().rep())) {
                 slot.setCustom(this, staticFunctionGetter);
@@ -143 +143 @@
         }
     
-        if (__JSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
+        if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
             if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep())) {
                 if (entry->attributes & kJSPropertyAttributeReadOnly)
@@ -154 +154 @@
         }
         
-        if (__JSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
+        if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
             if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
                 if (entry->attributes & kJSPropertyAttributeReadOnly)
@@ -184 +184 @@
         }
 
-        if (__JSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
+        if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
             if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep())) {
                 if (entry->attributes & kJSPropertyAttributeDontDelete)
@@ -192 +192 @@
         }
         
-        if (__JSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
+        if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
             if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
                 if (entry->attributes & kJSPropertyAttributeDontDelete)
@@ -298 +298 @@
             getPropertyNames(execRef, thisRef, toRef(&propertyNames));
 
-        if (__JSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
-            typedef __JSClass::StaticValuesTable::const_iterator iterator;
+        if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
+            typedef OpaqueJSClass::StaticValuesTable::const_iterator iterator;
             iterator end = staticValues->end();
             for (iterator it = staticValues->begin(); it != end; ++it) {
@@ -309 +309 @@
         }
 
-        if (__JSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
-            typedef __JSClass::StaticFunctionsTable::const_iterator iterator;
+        if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
+            typedef OpaqueJSClass::StaticFunctionsTable::const_iterator iterator;
             iterator end = staticFunctions->end();
             for (iterator it = staticFunctions->begin(); it != end; ++it) {
@@ -385 +385 @@
 
     for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass)
-        if (__JSClass::StaticValuesTable* staticValues = jsClass->staticValues)
+        if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues)
             if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep()))
                 if (JSObjectGetPropertyCallback getProperty = entry->getProperty)
@@ -403 +403 @@
 
     for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass) {
-        if (__JSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
+        if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
             if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
                 if (JSObjectCallAsFunctionCallback callAsFunction = entry->callAsFunction) {