diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:32 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:32 -0800 |
commit | 635860845790a19bf50bbc51ba8fb66a96dde068 (patch) | |
tree | ef6ad9ff73a5b57f65249d4232a202fa77e6a140 /WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp | |
parent | 8e35f3cfc7fba1d1c829dc557ebad6409cbe16a2 (diff) | |
download | external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.zip external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.gz external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.bz2 |
auto import from //depot/cupcake/@136594
Diffstat (limited to 'WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp')
-rw-r--r-- | WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp b/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp index 097f809..5c8b8d4 100644 --- a/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp +++ b/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp @@ -30,7 +30,6 @@ #include "JSCustomSQLTransactionErrorCallback.h" #include "CString.h" -#include "Console.h" #include "DOMWindow.h" #include "Frame.h" #include "ScriptController.h" @@ -60,9 +59,9 @@ bool JSCustomSQLTransactionErrorCallback::handleEvent(SQLError* error) JSC::JSLock lock(false); - JSValue* function = m_callback->get(exec, Identifier(exec, "handleEvent")); + JSValuePtr function = m_callback->get(exec, Identifier(exec, "handleEvent")); CallData callData; - CallType callType = function->getCallData(callData); + CallType callType = function.getCallData(callData); if (callType == CallTypeNone) { callType = m_callback->getCallData(callData); if (callType == CallTypeNone) { @@ -77,17 +76,17 @@ bool JSCustomSQLTransactionErrorCallback::handleEvent(SQLError* error) ArgList args; args.append(toJS(exec, error)); - JSValue* result; + JSValuePtr result; globalObject->startTimeoutCheck(); result = call(exec, function, callType, callData, m_callback, args); globalObject->stopTimeoutCheck(); if (exec->hadException()) - m_frame->domWindow()->console()->reportCurrentException(exec); + reportCurrentException(exec); Document::updateDocumentsRendering(); - return result->toBoolean(exec); + return result.toBoolean(exec); } } |