From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- .../Modules/webdatabase/ChangeVersionWrapper.h | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h') diff --git a/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h b/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h index 3b1a2a058..eb7efe3c4 100644 --- a/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h +++ b/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h @@ -10,7 +10,7 @@ * 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 + * 3. Neither the name of Apple 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. * @@ -25,12 +25,10 @@ * (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 ChangeVersionWrapper_h -#define ChangeVersionWrapper_h -#if ENABLE(SQL_DATABASE) +#pragma once -#include "SQLTransactionBackend.h" +#include "SQLTransaction.h" #include namespace WebCore { @@ -39,12 +37,12 @@ class SQLError; class ChangeVersionWrapper : public SQLTransactionWrapper { public: - static PassRefPtr create(const String& oldVersion, const String& newVersion) { return adoptRef(new ChangeVersionWrapper(oldVersion, newVersion)); } + static Ref create(const String& oldVersion, const String& newVersion) { return adoptRef(*new ChangeVersionWrapper(oldVersion, newVersion)); } - virtual bool performPreflight(SQLTransactionBackend*); - virtual bool performPostflight(SQLTransactionBackend*); - virtual SQLError* sqlError() const { return m_sqlError.get(); } - virtual void handleCommitFailedAfterPostflight(SQLTransactionBackend*); + bool performPreflight(SQLTransaction&) override; + bool performPostflight(SQLTransaction&) override; + SQLError* sqlError() const override { return m_sqlError.get(); }; + void handleCommitFailedAfterPostflight(SQLTransaction&) override; private: ChangeVersionWrapper(const String& oldVersion, const String& newVersion); @@ -55,7 +53,3 @@ private: }; } // namespace WebCore - -#endif - -#endif // ChangeVersionWrapper_h -- cgit v1.2.1