← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebCore/bindings/js/JSCustomXPathNSResolver.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/bindings/js/JSCustomXPathNSResolver.cpp
39
39
 
40
40
using namespace JSC;
41
41
 
42
 
PassRefPtr<JSCustomXPathNSResolver> JSCustomXPathNSResolver::create(JSC::ExecState* exec, JSC::JSValuePtr value)
 
42
PassRefPtr<JSCustomXPathNSResolver> JSCustomXPathNSResolver::create(JSC::ExecState* exec, JSC::JSValue value)
43
43
{
44
44
    if (value.isUndefinedOrNull())
45
45
        return 0;
77
77
    JSGlobalObject* globalObject = m_frame->script()->globalObject();
78
78
    ExecState* exec = globalObject->globalExec();
79
79
        
80
 
    JSValuePtr function = m_customResolver->get(exec, Identifier(exec, "lookupNamespaceURI"));
 
80
    JSValue function = m_customResolver->get(exec, Identifier(exec, "lookupNamespaceURI"));
81
81
    CallData callData;
82
82
    CallType callType = function.getCallData(callData);
83
83
    if (callType == CallTypeNone) {
92
92
 
93
93
    RefPtr<JSCustomXPathNSResolver> selfProtector(this);
94
94
 
95
 
    ArgList args;
 
95
    MarkedArgumentBuffer args;
96
96
    args.append(jsString(exec, prefix));
97
97
 
98
98
    globalObject->globalData()->timeoutChecker.start();
99
 
    JSValuePtr retval = call(exec, function, callType, callData, m_customResolver, args);
 
99
    JSValue retval = call(exec, function, callType, callData, m_customResolver, args);
100
100
    globalObject->globalData()->timeoutChecker.stop();
101
101
 
102
102
    String result;