From 029f9407fff4f71169693f5945448de50460c71a Mon Sep 17 00:00:00 2001 From: "beidson@apple.com" Date: Wed, 14 Nov 2007 01:54:01 +0000 Subject: [PATCH] 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: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27775 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 12 ++++ .../storage/JSCustomSQLStatementCallback.h | 59 ------------------ .../JSCustomSQLStatementErrorCallback.h | 60 ------------------- .../storage/JSCustomSQLTransactionCallback.h | 59 ------------------ .../JSCustomSQLTransactionErrorCallback.h | 59 ------------------ WebCore/storage/SQLStatementCallback.idl | 2 +- 6 files changed, 13 insertions(+), 238 deletions(-) delete mode 100644 WebCore/storage/JSCustomSQLStatementCallback.h delete mode 100644 WebCore/storage/JSCustomSQLStatementErrorCallback.h delete mode 100644 WebCore/storage/JSCustomSQLTransactionCallback.h delete mode 100644 WebCore/storage/JSCustomSQLTransactionErrorCallback.h diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 61eaa4322be8..9d1514d2cf85 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2007-11-13 Brady Eidson + + 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 Fix a bug and improve upon Brady's fix diff --git a/WebCore/storage/JSCustomSQLStatementCallback.h b/WebCore/storage/JSCustomSQLStatementCallback.h deleted file mode 100644 index 27bca7b9a7a1..000000000000 --- a/WebCore/storage/JSCustomSQLStatementCallback.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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 -#include -#include - -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 m_callback; - RefPtr m_frame; -}; - -} - -#endif // JSCustomSQLStatementCallback_h diff --git a/WebCore/storage/JSCustomSQLStatementErrorCallback.h b/WebCore/storage/JSCustomSQLStatementErrorCallback.h deleted file mode 100644 index 7bc40c6b4db6..000000000000 --- a/WebCore/storage/JSCustomSQLStatementErrorCallback.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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 -#include -#include - -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 m_callback; - RefPtr m_frame; -}; - -} - -#endif // JSCustomSQLStatementErrorCallback_h - diff --git a/WebCore/storage/JSCustomSQLTransactionCallback.h b/WebCore/storage/JSCustomSQLTransactionCallback.h deleted file mode 100644 index 40f099d3c368..000000000000 --- a/WebCore/storage/JSCustomSQLTransactionCallback.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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 -#include -#include - -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 m_callback; - RefPtr m_frame; -}; - -} - -#endif // JSCustomSQLTransactionCallback_h diff --git a/WebCore/storage/JSCustomSQLTransactionErrorCallback.h b/WebCore/storage/JSCustomSQLTransactionErrorCallback.h deleted file mode 100644 index 6b079c4cfd65..000000000000 --- a/WebCore/storage/JSCustomSQLTransactionErrorCallback.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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 -#include -#include - -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 m_callback; - RefPtr m_frame; -}; - -} - -#endif // JSCustomSQLTransactionErrorCallback_h diff --git a/WebCore/storage/SQLStatementCallback.idl b/WebCore/storage/SQLStatementCallback.idl index 9ac5f4c3698c..783e8c4f61b9 100644 --- a/WebCore/storage/SQLStatementCallback.idl +++ b/WebCore/storage/SQLStatementCallback.idl @@ -29,7 +29,7 @@ module storage { interface SQLStatementCallback { - void handleEvent(in SQLTransaction transaction); + void handleEvent(in SQLTransaction transaction, in SQLResultSet resultSet); }; } -- 2.36.0