From 635860845790a19bf50bbc51ba8fb66a96dde068 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 5 Mar 2009 14:34:32 -0800
Subject: auto import from //depot/cupcake/@136594

---
 WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp')

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);
 }
     
 }
-- 
cgit v1.1