+2007-11-13 Brady Eidson <beidson@apple.com>
+
+ Reviewed by Mark Rowe
+
+ Remove errantly added files, and fix the idl (for reference's sake)
+
+ * storage/JSCustomSQLStatementCallback.h: Removed.
+ * storage/JSCustomSQLStatementErrorCallback.h: Removed.
+ * storage/JSCustomSQLTransactionCallback.h: Removed.
+ * storage/JSCustomSQLTransactionErrorCallback.h: Removed.
+ * storage/SQLStatementCallback.idl:
+
2007-11-13 Adam Roben <aroben@apple.com>
Fix a bug and improve upon Brady's fix
+++ /dev/null
-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JSCustomSQLStatementCallback_h
-#define JSCustomSQLStatementCallback_h
-
-#include "SQLStatementCallback.h"
-
-#include <kjs/object.h>
-#include <kjs/protect.h>
-#include <wtf/Forward.h>
-
-namespace KJS {
- class JSObject;
-}
-
-namespace WebCore {
-
-class Frame;
-class SQLResultSet;
-
-class JSCustomSQLStatementCallback : public SQLStatementCallback {
-public:
- JSCustomSQLStatementCallback(KJS::JSObject* callback, Frame*);
-
- virtual void handleEvent(SQLTransaction*, SQLResultSet*, bool& raisedException);
-private:
- KJS::ProtectedPtr<KJS::JSObject> m_callback;
- RefPtr<Frame> m_frame;
-};
-
-}
-
-#endif // JSCustomSQLStatementCallback_h
+++ /dev/null
-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JSCustomSQLStatementErrorCallback_h
-#define JSCustomSQLStatementErrorCallback_h
-
-#include "SQLStatementErrorCallback.h"
-
-#include <kjs/object.h>
-#include <kjs/protect.h>
-#include <wtf/Forward.h>
-
-namespace KJS {
- class JSObject;
-}
-
-namespace WebCore {
-
-class Frame;
-class SQLError;
-
-class JSCustomSQLStatementErrorCallback : public SQLStatementErrorCallback {
-public:
- JSCustomSQLStatementErrorCallback(KJS::JSObject* callback, Frame*);
-
- virtual bool handleEvent(SQLTransaction*, SQLError*);
-private:
- KJS::ProtectedPtr<KJS::JSObject> m_callback;
- RefPtr<Frame> m_frame;
-};
-
-}
-
-#endif // JSCustomSQLStatementErrorCallback_h
-
+++ /dev/null
-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JSCustomSQLTransactionCallback_h
-#define JSCustomSQLTransactionCallback_h
-
-#include "SQLTransactionCallback.h"
-
-#include <kjs/object.h>
-#include <kjs/protect.h>
-#include <wtf/Forward.h>
-
-namespace KJS {
- class JSObject;
-}
-
-namespace WebCore {
-
-class Frame;
-class SQLResultSet;
-
-class JSCustomSQLTransactionCallback : public SQLTransactionCallback {
-public:
- JSCustomSQLTransactionCallback(KJS::JSObject* callback, Frame*);
-
- virtual void handleEvent(SQLTransaction*, bool& raisedException);
-private:
- KJS::ProtectedPtr<KJS::JSObject> m_callback;
- RefPtr<Frame> m_frame;
-};
-
-}
-
-#endif // JSCustomSQLTransactionCallback_h
+++ /dev/null
-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JSCustomSQLTransactionErrorCallback_h
-#define JSCustomSQLTransactionErrorCallback_h
-
-#include "SQLTransactionErrorCallback.h"
-
-#include <kjs/object.h>
-#include <kjs/protect.h>
-#include <wtf/Forward.h>
-
-namespace KJS {
- class JSObject;
-}
-
-namespace WebCore {
-
-class Frame;
-class SQLError;
-
-class JSCustomSQLTransactionErrorCallback : public SQLTransactionErrorCallback {
-public:
- JSCustomSQLTransactionErrorCallback(KJS::JSObject* callback, Frame*);
-
- virtual bool handleEvent(SQLError*);
-private:
- KJS::ProtectedPtr<KJS::JSObject> m_callback;
- RefPtr<Frame> m_frame;
-};
-
-}
-
-#endif // JSCustomSQLTransactionErrorCallback_h
module storage {
interface SQLStatementCallback {
- void handleEvent(in SQLTransaction transaction);
+ void handleEvent(in SQLTransaction transaction, in SQLResultSet resultSet);
};
}
git://git.webkit.org / WebKit-https.git / commitdiff