Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Side by Side Diff: Source/modules/webdatabase/ChangeVersionWrapper.cpp

Issue 210833005: Oilpan: Prepare to move SQLError to oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 bool ChangeVersionWrapper::performPreflight(SQLTransactionBackend* transaction) 44 bool ChangeVersionWrapper::performPreflight(SQLTransactionBackend* transaction)
45 { 45 {
46 ASSERT(transaction && transaction->database()); 46 ASSERT(transaction && transaction->database());
47 47
48 DatabaseBackend* database = transaction->database(); 48 DatabaseBackend* database = transaction->database();
49 49
50 String actualVersion; 50 String actualVersion;
51 if (!database->getVersionFromDatabase(actualVersion)) { 51 if (!database->getVersionFromDatabase(actualVersion)) {
52 int sqliteError = database->sqliteDatabase().lastError(); 52 int sqliteError = database->sqliteDatabase().lastError();
53 database->reportChangeVersionResult(1, SQLError::UNKNOWN_ERR, sqliteErro r); 53 database->reportChangeVersionResult(1, SQLError::UNKNOWN_ERR, sqliteErro r);
54 m_sqlError = SQLError::create(SQLError::UNKNOWN_ERR, "unable to read the current version", 54 m_sqlError = SQLErrorData::create(SQLError::UNKNOWN_ERR, "unable to read the current version",
55 sqliteError, database->sqliteDatabase().la stErrorMsg()); 55 sqliteError, database->sqliteDatabase().lastErrorMsg());
56 return false; 56 return false;
57 } 57 }
58 58
59 if (actualVersion != m_oldVersion) { 59 if (actualVersion != m_oldVersion) {
60 database->reportChangeVersionResult(2, SQLError::VERSION_ERR, 0); 60 database->reportChangeVersionResult(2, SQLError::VERSION_ERR, 0);
61 m_sqlError = SQLError::create(SQLError::VERSION_ERR, "current version of the database and `oldVersion` argument do not match"); 61 m_sqlError = SQLErrorData::create(SQLError::VERSION_ERR, "current versio n of the database and `oldVersion` argument do not match");
62 return false; 62 return false;
63 } 63 }
64 64
65 return true; 65 return true;
66 } 66 }
67 67
68 bool ChangeVersionWrapper::performPostflight(SQLTransactionBackend* transaction) 68 bool ChangeVersionWrapper::performPostflight(SQLTransactionBackend* transaction)
69 { 69 {
70 ASSERT(transaction && transaction->database()); 70 ASSERT(transaction && transaction->database());
71 71
72 DatabaseBackend* database = transaction->database(); 72 DatabaseBackend* database = transaction->database();
73 73
74 if (!database->setVersionInDatabase(m_newVersion)) { 74 if (!database->setVersionInDatabase(m_newVersion)) {
75 int sqliteError = database->sqliteDatabase().lastError(); 75 int sqliteError = database->sqliteDatabase().lastError();
76 database->reportChangeVersionResult(3, SQLError::UNKNOWN_ERR, sqliteErro r); 76 database->reportChangeVersionResult(3, SQLError::UNKNOWN_ERR, sqliteErro r);
77 m_sqlError = SQLError::create(SQLError::UNKNOWN_ERR, "unable to set new version in database", 77 m_sqlError = SQLErrorData::create(SQLError::UNKNOWN_ERR, "unable to set new version in database",
78 sqliteError, database->sqliteDatabase().la stErrorMsg()); 78 sqliteError, database->sqliteDatabase().lastErrorMsg());
79 return false; 79 return false;
80 } 80 }
81 81
82 database->setExpectedVersion(m_newVersion); 82 database->setExpectedVersion(m_newVersion);
83 83
84 database->reportChangeVersionResult(0, -1, 0); // OK 84 database->reportChangeVersionResult(0, -1, 0); // OK
85 return true; 85 return true;
86 } 86 }
87 87
88 void ChangeVersionWrapper::handleCommitFailedAfterPostflight(SQLTransactionBacke nd* transaction) 88 void ChangeVersionWrapper::handleCommitFailedAfterPostflight(SQLTransactionBacke nd* transaction)
89 { 89 {
90 transaction->database()->setCachedVersion(m_oldVersion); 90 transaction->database()->setCachedVersion(m_oldVersion);
91 } 91 }
92 92
93 } // namespace WebCore 93 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698