← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-05-15 18:30:58 UTC
  • mto: (4.4.1 sid) (1.2.2 upstream) (16.1.1 lucid)
  • mto: This revision was merged to the branch mainline in revision 8.
  • Revision ID: james.westby@ubuntu.com-20090515183058-35m5or0ufm5tutud
Tags: upstream-1.1.7
Import upstream version 1.1.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp
29
29
#include "config.h"
30
30
#include "JSCustomSQLStatementErrorCallback.h"
31
31
 
 
32
#if ENABLE(DATABASE)
 
33
 
32
34
#include "Frame.h"
33
35
#include "ScriptController.h"
34
36
#include "JSSQLError.h"
58
60
        
59
61
    JSC::JSLock lock(false);
60
62
        
61
 
    JSValuePtr handleEventFunction = m_callback->get(exec, Identifier(exec, "handleEvent"));
 
63
    JSValue handleEventFunction = m_callback->get(exec, Identifier(exec, "handleEvent"));
62
64
    CallData handleEventCallData;
63
65
    CallType handleEventCallType = handleEventFunction.getCallData(handleEventCallData);
64
66
    CallData callbackCallData;
74
76
        
75
77
    RefPtr<JSCustomSQLStatementErrorCallback> protect(this);
76
78
        
77
 
    ArgList args;
 
79
    MarkedArgumentBuffer args;
78
80
    args.append(toJS(exec, transaction));
79
81
    args.append(toJS(exec, error));
80
82
        
81
 
    JSValuePtr result;
 
83
    JSValue result;
82
84
    globalObject->globalData()->timeoutChecker.start();
83
85
    if (handleEventCallType != CallTypeNone)
84
86
        result = call(exec, handleEventFunction, handleEventCallType, handleEventCallData, m_callback, args);
102
104
}
103
105
 
104
106
}
 
107
 
 
108
#endif // ENABLE(DATABASE)