Changeset 57227 in webkit
- Timestamp:
- Apr 7, 2010 1:37:59 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r57225 r57227 1 2010-04-07 Oliver Hunt <oliver@apple.com> 2 3 Reviewed by Darin Adler. 4 5 Remove some unnecessary uses of commonJSGlobalData 6 https://bugs.webkit.org/show_bug.cgi?id=37229 7 8 Pass the ExecState down to identifierFromNPIdentifier and update call sites 9 10 * bridge/NP_jsobject.cpp: 11 (_NPN_Invoke): 12 (_NPN_GetProperty): 13 (_NPN_SetProperty): 14 (_NPN_RemoveProperty): 15 (_NPN_HasProperty): 16 (_NPN_HasMethod): 17 * bridge/c/c_instance.cpp: 18 (JSC::Bindings::CInstance::getPropertyNames): 19 * bridge/c/c_utility.cpp: 20 (JSC::Bindings::identifierFromNPIdentifier): 21 * bridge/c/c_utility.h: 22 1 23 2010-04-07 Kenneth Rohde Christiansen <kenneth@webkit.org> 2 24 -
trunk/WebCore/bridge/NP_jsobject.cpp
r56560 r57227 231 231 ExecState* exec = rootObject->globalObject()->globalExec(); 232 232 JSLock lock(SilenceAssertionsOnly); 233 JSValue function = obj->imp->get(exec, identifierFromNPIdentifier( i->string()));233 JSValue function = obj->imp->get(exec, identifierFromNPIdentifier(exec, i->string())); 234 234 CallData callData; 235 235 CallType callType = function.getCallData(callData); … … 312 312 JSValue result; 313 313 if (i->isString()) 314 result = obj->imp->get(exec, identifierFromNPIdentifier( i->string()));314 result = obj->imp->get(exec, identifierFromNPIdentifier(exec, i->string())); 315 315 else 316 316 result = obj->imp->get(exec, i->number()); … … 346 346 if (i->isString()) { 347 347 PutPropertySlot slot; 348 obj->imp->put(exec, identifierFromNPIdentifier( i->string()), convertNPVariantToValue(exec, variant, rootObject), slot);348 obj->imp->put(exec, identifierFromNPIdentifier(exec, i->string()), convertNPVariantToValue(exec, variant, rootObject), slot); 349 349 } else 350 350 obj->imp->put(exec, i->number(), convertNPVariantToValue(exec, variant, rootObject)); … … 371 371 IdentifierRep* i = static_cast<IdentifierRep*>(propertyName); 372 372 if (i->isString()) { 373 if (!obj->imp->hasProperty(exec, identifierFromNPIdentifier( i->string()))) {373 if (!obj->imp->hasProperty(exec, identifierFromNPIdentifier(exec, i->string()))) { 374 374 exec->clearException(); 375 375 return false; … … 384 384 JSLock lock(SilenceAssertionsOnly); 385 385 if (i->isString()) 386 obj->imp->deleteProperty(exec, identifierFromNPIdentifier( i->string()));386 obj->imp->deleteProperty(exec, identifierFromNPIdentifier(exec, i->string())); 387 387 else 388 388 obj->imp->deleteProperty(exec, i->number()); … … 407 407 JSLock lock(SilenceAssertionsOnly); 408 408 if (i->isString()) { 409 bool result = obj->imp->hasProperty(exec, identifierFromNPIdentifier( i->string()));409 bool result = obj->imp->hasProperty(exec, identifierFromNPIdentifier(exec, i->string())); 410 410 exec->clearException(); 411 411 return result; … … 438 438 ExecState* exec = rootObject->globalObject()->globalExec(); 439 439 JSLock lock(SilenceAssertionsOnly); 440 JSValue func = obj->imp->get(exec, identifierFromNPIdentifier( i->string()));440 JSValue func = obj->imp->get(exec, identifierFromNPIdentifier(exec, i->string())); 441 441 exec->clearException(); 442 442 return !func.isUndefined(); -
trunk/WebCore/bridge/c/c_instance.cpp
r55312 r57227 304 304 305 305 if (identifier->isString()) 306 nameArray.add(identifierFromNPIdentifier( identifier->string()));306 nameArray.add(identifierFromNPIdentifier(exec, identifier->string())); 307 307 else 308 308 nameArray.add(Identifier::from(exec, identifier->number())); -
trunk/WebCore/bridge/c/c_utility.cpp
r56560 r57227 144 144 } 145 145 146 Identifier identifierFromNPIdentifier( const NPUTF8* name)146 Identifier identifierFromNPIdentifier(ExecState* exec, const NPUTF8* name) 147 147 { 148 return Identifier( WebCore::JSDOMWindow::commonJSGlobalData(), convertUTF8ToUTF16WithLatin1Fallback(name, -1));148 return Identifier(exec, convertUTF8ToUTF16WithLatin1Fallback(name, -1)); 149 149 } 150 150 -
trunk/WebCore/bridge/c/c_utility.h
r43122 r57227 50 50 void convertValueToNPVariant(ExecState*, JSValue, NPVariant* result); 51 51 JSValue convertNPVariantToValue(ExecState*, const NPVariant*, RootObject*); 52 Identifier identifierFromNPIdentifier( const NPUTF8* name);52 Identifier identifierFromNPIdentifier(ExecState*, const NPUTF8* name); 53 53 54 54 } }
Note: See TracChangeset
for help on using the changeset viewer.