← Back to branch summary

~ubuntu-branches/ubuntu/karmic/webkit/karmic-proposed

« back to all changes in this revision

Viewing changes to WebCore/inspector/JavaScriptProfileNode.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-05-15 18:30:58 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090515183058-50q5exjo9b1kxy9s
Tags: 1.1.7-1
http://bugs.debian.org/526683
* New upstream release
* debian/libwebkit-1.0-2.symbols:
- updated with the new symbols in 1.1.7
* debian/libwebkit-dev.install, debian/libwebkit-dev.links,
  debian/rules:
- Build, and ship gtk-doc documentation (Closes: #526683)
* debian/copyright:
- updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/inspector/JavaScriptProfileNode.cpp
171
171
    if (exception && *exception)
172
172
        return JSValueMakeUndefined(ctx);
173
173
 
 
174
    ExecState* exec = toJS(ctx);
174
175
    for (Vector<RefPtr<ProfileNode> >::const_iterator it = children.begin(); it != children.end(); ++it) {
175
 
        JSValueRef arg0 = toRef(toJS(toJS(ctx), (*it).get() ));
 
176
        JSValueRef arg0 = toRef(exec, toJS(exec, (*it).get() ));
176
177
        JSObjectCallAsFunction(ctx, pushFunction, result, 1, &arg0, exception);
177
178
        if (exception && *exception)
178
179
            return JSValueMakeUndefined(ctx);
189
190
        return JSValueMakeUndefined(ctx);
190
191
 
191
192
    ProfileNode* profileNode = static_cast<ProfileNode*>(JSObjectGetPrivate(thisObject));
192
 
    return toRef(toJS(toJS(ctx), profileNode->parent())
193
 
    );
 
193
    ExecState* exec = toJS(ctx);
 
194
    return toRef(exec, toJS(exec, profileNode->parent()));
194
195
}
195
196
 
196
197
static JSValueRef getHead(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
201
202
        return JSValueMakeUndefined(ctx);
202
203
 
203
204
    ProfileNode* profileNode = static_cast<ProfileNode*>(JSObjectGetPrivate(thisObject));
204
 
    return toRef(toJS(toJS(ctx), profileNode->head()));
 
205
    ExecState* exec = toJS(ctx);
 
206
    return toRef(exec, toJS(exec, profileNode->head()));
205
207
}
206
208
 
207
209
static JSValueRef getVisible(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*)
261
263
    return profileNodeClass;
262
264
}
263
265
 
264
 
JSValuePtr toJS(ExecState* exec, ProfileNode* profileNode)
 
266
JSValue toJS(ExecState* exec, ProfileNode* profileNode)
265
267
{
266
268
    if (!profileNode)
267
269
        return jsNull();