Show
Ignore:
Timestamp:
08/18/08 11:14:49 (5 months ago)
Author:
odole
Message:

merge with webkit revision 35814

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/API/JSValueRef.cpp

    r427 r440  
    189189    exec->globalData().heap->registerThread(); 
    190190 
    191     UString::Rep* rep = toJS(string); 
    192     return toRef(jsString(exec, UString(rep))); 
     191    return toRef(jsString(exec, string->ustring())); 
    193192} 
    194193 
    …… 
    224223    JSValue* jsValue = toJS(value); 
    225224     
    226     JSStringRef stringRef = toRef(jsValue->toString(exec).rep()->ref()); 
    227     if (exec->hadException()) { 
    228         if (exception) 
    229             *exception = toRef(exec->exception()); 
    230         exec->clearException(); 
    231         stringRef = 0; 
    232     } 
    233     return stringRef; 
     225    RefPtr<OpaqueJSString> stringRef(OpaqueJSString::create(jsValue->toString(exec))); 
     226    if (exec->hadException()) { 
     227        if (exception) 
     228            *exception = toRef(exec->exception()); 
     229        exec->clearException(); 
     230        stringRef.clear(); 
     231    } 
     232    return stringRef.release().releaseRef(); 
    234233} 
    235234