Changeset 35004 in webkit
- Timestamp:
- Jul 4, 2008 3:43:10 PM (16 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r35003 r35004 1 2008-07-04 Cameron Zwarich <cwzwarich@uwaterloo.ca> 2 3 Reviewed by Eric Seidel. 4 5 Bring our implementation of the Netscape plugin API closer to current 6 code style guidelines. 7 8 * bridge/NP_jsobject.cpp: 9 (getListFromVariantArgs): 10 (jsAllocate): 11 (jsDeallocate): 12 (_NPN_CreateScriptObject): 13 (_NPN_CreateNoScriptObject): 14 (_NPN_InvokeDefault): 15 (_NPN_Invoke): 16 (_NPN_Evaluate): 17 (_NPN_GetProperty): 18 (_NPN_SetProperty): 19 (_NPN_RemoveProperty): 20 (_NPN_HasProperty): 21 (_NPN_HasMethod): 22 (_NPN_Enumerate): 23 * bridge/npruntime_impl.h: 24 1 25 2008-07-04 Simon Hausmann <hausmann@webkit.org> 2 26 -
trunk/WebCore/bridge/NP_jsobject.cpp
r34982 r35004 47 47 static void getListFromVariantArgs(ExecState* exec, const NPVariant* args, unsigned argCount, RootObject* rootObject, ArgList& aList) 48 48 { 49 for (unsigned i = 0; i < argCount; i++)49 for (unsigned i = 0; i < argCount; ++i) 50 50 aList.append(convertNPVariantToValue(exec, &args[i], rootObject)); 51 51 } … … 53 53 static NPObject* jsAllocate(NPP, NPClass*) 54 54 { 55 return (NPObject*)malloc(sizeof(JavaScriptObject));55 return static_cast<NPObject*>(malloc(sizeof(JavaScriptObject))); 56 56 } 57 57 58 58 static void jsDeallocate(NPObject* npObj) 59 59 { 60 JavaScriptObject* obj = (JavaScriptObject*)npObj;60 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(npObj); 61 61 62 62 if (obj->rootObject && obj->rootObject->isValid()) … … 77 77 NPObject* _NPN_CreateScriptObject(NPP npp, JSObject* imp, PassRefPtr<RootObject> rootObject) 78 78 { 79 JavaScriptObject* obj = (JavaScriptObject*)_NPN_CreateObject(npp, NPScriptObjectClass);79 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(_NPN_CreateObject(npp, NPScriptObjectClass)); 80 80 81 81 obj->rootObject = rootObject.releaseRef(); … … 85 85 obj->imp = imp; 86 86 87 return (NPObject*)obj;88 } 89 90 NPObject *_NPN_CreateNoScriptObject(void)87 return reinterpret_cast<NPObject*>(obj); 88 } 89 90 NPObject* _NPN_CreateNoScriptObject(void) 91 91 { 92 92 return _NPN_CreateObject(0, NPNoScriptObjectClass); … … 96 96 { 97 97 if (o->_class == NPScriptObjectClass) { 98 JavaScriptObject* obj = (JavaScriptObject*)o;98 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o); 99 99 100 100 VOID_TO_NPVARIANT(*result); … … 118 118 getListFromVariantArgs(exec, args, argCount, rootObject, argList); 119 119 rootObject->globalObject()->startTimeoutCheck(); 120 JSValue *resultV = call(exec, function, callType, callData, function, argList);120 JSValue* resultV = call(exec, function, callType, callData, function, argList); 121 121 rootObject->globalObject()->stopTimeoutCheck(); 122 122 … … 135 135 { 136 136 if (o->_class == NPScriptObjectClass) { 137 JavaScriptObject* obj = (JavaScriptObject*)o;138 139 PrivateIdentifier* i = (PrivateIdentifier*)methodName;137 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o); 138 139 PrivateIdentifier* i = static_cast<PrivateIdentifier*>(methodName); 140 140 if (!i->isString) 141 141 return false; … … 147 147 if (args[0].type != NPVariantType_String) 148 148 return false; 149 return _NPN_Evaluate(npp, o, (NPString *)&args[0].value.stringValue, result);149 return _NPN_Evaluate(npp, o, const_cast<NPString*>(&args[0].value.stringValue), result); 150 150 } 151 151 … … 184 184 { 185 185 if (o->_class == NPScriptObjectClass) { 186 JavaScriptObject* obj = (JavaScriptObject*)o;186 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o); 187 187 188 188 RootObject* rootObject = obj->rootObject; … … 219 219 { 220 220 if (o->_class == NPScriptObjectClass) { 221 JavaScriptObject* obj = (JavaScriptObject*)o;222 223 RootObject* rootObject = obj->rootObject; 224 if (!rootObject || !rootObject->isValid()) 225 return false; 226 227 ExecState* exec = rootObject->globalObject()->globalExec(); 228 PrivateIdentifier* i = (PrivateIdentifier*)propertyName;229 230 JSLock lock(false); 231 JSValue *result;221 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o); 222 223 RootObject* rootObject = obj->rootObject; 224 if (!rootObject || !rootObject->isValid()) 225 return false; 226 227 ExecState* exec = rootObject->globalObject()->globalExec(); 228 PrivateIdentifier* i = static_cast<PrivateIdentifier*>(propertyName); 229 230 JSLock lock(false); 231 JSValue* result; 232 232 if (i->isString) 233 233 result = obj->imp->get(exec, identifierFromNPIdentifier(i->value.string)); … … 252 252 { 253 253 if (o->_class == NPScriptObjectClass) { 254 JavaScriptObject* obj = (JavaScriptObject*)o;255 256 RootObject* rootObject = obj->rootObject; 257 if (!rootObject || !rootObject->isValid()) 258 return false; 259 260 ExecState* exec = rootObject->globalObject()->globalExec(); 261 JSLock lock(false); 262 PrivateIdentifier* i = (PrivateIdentifier*)propertyName;254 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o); 255 256 RootObject* rootObject = obj->rootObject; 257 if (!rootObject || !rootObject->isValid()) 258 return false; 259 260 ExecState* exec = rootObject->globalObject()->globalExec(); 261 JSLock lock(false); 262 PrivateIdentifier* i = static_cast<PrivateIdentifier*>(propertyName); 263 263 if (i->isString) 264 264 obj->imp->put(exec, identifierFromNPIdentifier(i->value.string), convertNPVariantToValue(exec, variant, rootObject)); … … 277 277 { 278 278 if (o->_class == NPScriptObjectClass) { 279 JavaScriptObject* obj = (JavaScriptObject*)o;280 281 RootObject* rootObject = obj->rootObject; 282 if (!rootObject || !rootObject->isValid()) 283 return false; 284 285 ExecState* exec = rootObject->globalObject()->globalExec(); 286 PrivateIdentifier* i = (PrivateIdentifier*)propertyName;279 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o); 280 281 RootObject* rootObject = obj->rootObject; 282 if (!rootObject || !rootObject->isValid()) 283 return false; 284 285 ExecState* exec = rootObject->globalObject()->globalExec(); 286 PrivateIdentifier* i = static_cast<PrivateIdentifier*>(propertyName); 287 287 if (i->isString) { 288 288 if (!obj->imp->hasProperty(exec, identifierFromNPIdentifier(i->value.string))) … … 307 307 { 308 308 if (o->_class == NPScriptObjectClass) { 309 JavaScriptObject* obj = (JavaScriptObject*)o;310 311 RootObject* rootObject = obj->rootObject; 312 if (!rootObject || !rootObject->isValid()) 313 return false; 314 315 ExecState* exec = rootObject->globalObject()->globalExec(); 316 PrivateIdentifier* i = (PrivateIdentifier*)propertyName;309 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o); 310 311 RootObject* rootObject = obj->rootObject; 312 if (!rootObject || !rootObject->isValid()) 313 return false; 314 315 ExecState* exec = rootObject->globalObject()->globalExec(); 316 PrivateIdentifier* i = static_cast<PrivateIdentifier*>(propertyName); 317 317 JSLock lock(false); 318 318 if (i->isString) … … 330 330 { 331 331 if (o->_class == NPScriptObjectClass) { 332 JavaScriptObject* obj = (JavaScriptObject*)o;333 334 PrivateIdentifier* i = (PrivateIdentifier*)methodName;332 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o); 333 334 PrivateIdentifier* i = static_cast<PrivateIdentifier*>(methodName); 335 335 if (!i->isString) 336 336 return false; … … 359 359 } 360 360 361 bool _NPN_Enumerate(NPP, NPObject *o, NPIdentifier **identifier, uint32_t *count)362 { 363 if (o->_class == NPScriptObjectClass) { 364 JavaScriptObject* obj = (JavaScriptObject*)o;361 bool _NPN_Enumerate(NPP, NPObject* o, NPIdentifier** identifier, uint32_t* count) 362 { 363 if (o->_class == NPScriptObjectClass) { 364 JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o); 365 365 366 366 RootObject* rootObject = obj->rootObject; … … 375 375 unsigned size = static_cast<unsigned>(propertyNames.size()); 376 376 // FIXME: This should really call NPN_MemAlloc but that's in WebKit 377 NPIdentifier *identifiers = static_cast<NPIdentifier*>(malloc(sizeof(NPIdentifier) * size));378 379 for (unsigned i = 0; i < size; i++)377 NPIdentifier* identifiers = static_cast<NPIdentifier*>(malloc(sizeof(NPIdentifier) * size)); 378 379 for (unsigned i = 0; i < size; ++i) 380 380 identifiers[i] = _NPN_GetStringIdentifier(propertyNames[i].ustring().UTF8String().c_str()); 381 381 -
trunk/WebCore/bridge/npruntime_impl.h
r30897 r35004 35 35 #endif 36 36 37 extern void _NPN_ReleaseVariantValue(NPVariant *variant);38 extern NPIdentifier _NPN_GetStringIdentifier(const NPUTF8 *name);39 extern void _NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount, NPIdentifier *identifiers);40 extern NPIdentifier _NPN_GetIntIdentifier(int32_t intid);41 extern bool _NPN_IdentifierIsString(NPIdentifier identifier);42 extern NPUTF8 *_NPN_UTF8FromIdentifier(NPIdentifier identifier);43 extern int32_t _NPN_IntFromIdentifier(NPIdentifier identifier);44 extern NPObject *_NPN_CreateObject(NPP npp, NPClass *aClass);45 extern NPObject *_NPN_RetainObject(NPObject *obj);46 extern void _NPN_ReleaseObject(NPObject *obj);47 extern void _NPN_DeallocateObject(NPObject *obj);48 extern bool _NPN_Invoke(NPP npp, NPObject *npobj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result);49 extern bool _NPN_InvokeDefault(NPP npp, NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);50 extern bool _NPN_Evaluate(NPP npp, NPObject *npobj, NPString *script, NPVariant *result);51 extern bool _NPN_GetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName, NPVariant *result);52 extern bool _NPN_SetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName, const NPVariant *value);53 extern bool _NPN_RemoveProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName);54 extern bool _NPN_HasProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName);55 extern bool _NPN_HasMethod(NPP npp, NPObject *npobj, NPIdentifier methodName);56 extern void _NPN_SetException(NPObject *obj, const NPUTF8 *message);57 extern bool _NPN_Enumerate(NPP npp, NPObject *npobj, NPIdentifier **identifier, uint32_t *count);37 extern void _NPN_ReleaseVariantValue(NPVariant*); 38 extern NPIdentifier _NPN_GetStringIdentifier(const NPUTF8*); 39 extern void _NPN_GetStringIdentifiers(const NPUTF8** names, int32_t nameCount, NPIdentifier* identifiers); 40 extern NPIdentifier _NPN_GetIntIdentifier(int32_t); 41 extern bool _NPN_IdentifierIsString(NPIdentifier); 42 extern NPUTF8* _NPN_UTF8FromIdentifier(NPIdentifier); 43 extern int32_t _NPN_IntFromIdentifier(NPIdentifier); 44 extern NPObject* _NPN_CreateObject(NPP, NPClass*); 45 extern NPObject* _NPN_RetainObject(NPObject*); 46 extern void _NPN_ReleaseObject(NPObject*); 47 extern void _NPN_DeallocateObject(NPObject*); 48 extern bool _NPN_Invoke(NPP, NPObject*, NPIdentifier methodName, const NPVariant* args, uint32_t argCount, NPVariant* result); 49 extern bool _NPN_InvokeDefault(NPP, NPObject*, const NPVariant* args, uint32_t argCount, NPVariant* result); 50 extern bool _NPN_Evaluate(NPP, NPObject*, NPString*, NPVariant* result); 51 extern bool _NPN_GetProperty(NPP, NPObject*, NPIdentifier, NPVariant* result); 52 extern bool _NPN_SetProperty(NPP, NPObject*, NPIdentifier, const NPVariant*); 53 extern bool _NPN_RemoveProperty(NPP, NPObject*, NPIdentifier); 54 extern bool _NPN_HasProperty(NPP, NPObject*, NPIdentifier); 55 extern bool _NPN_HasMethod(NPP, NPObject*, NPIdentifier); 56 extern void _NPN_SetException(NPObject*, const NPUTF8*); 57 extern bool _NPN_Enumerate(NPP, NPObject*, NPIdentifier**, uint32_t* count); 58 58 59 59 #ifdef __cplusplus
Note: See TracChangeset
for help on using the changeset viewer.