| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 } | 128 } |
| 129 } | 129 } |
| 130 m_requestCallback->get()->sendSuccess(std::move(columnNames), | 130 m_requestCallback->get()->sendSuccess(std::move(columnNames), |
| 131 std::move(values), | 131 std::move(values), |
| 132 Maybe<protocol::Database::Error>()); | 132 Maybe<protocol::Database::Error>()); |
| 133 return true; | 133 return true; |
| 134 } | 134 } |
| 135 | 135 |
| 136 private: | 136 private: |
| 137 StatementCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) | 137 StatementCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) |
| 138 : m_requestCallback(requestCallback) {} | 138 : m_requestCallback(std::move(requestCallback)) {} |
| 139 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; | 139 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; |
| 140 }; | 140 }; |
| 141 | 141 |
| 142 class StatementErrorCallback final : public SQLStatementErrorCallback { | 142 class StatementErrorCallback final : public SQLStatementErrorCallback { |
| 143 public: | 143 public: |
| 144 static StatementErrorCallback* create( | 144 static StatementErrorCallback* create( |
| 145 PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) { | 145 PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) { |
| 146 return new StatementErrorCallback(std::move(requestCallback)); | 146 return new StatementErrorCallback(std::move(requestCallback)); |
| 147 } | 147 } |
| 148 | 148 |
| 149 ~StatementErrorCallback() override {} | 149 ~StatementErrorCallback() override {} |
| 150 | 150 |
| 151 DEFINE_INLINE_VIRTUAL_TRACE() { SQLStatementErrorCallback::trace(visitor); } | 151 DEFINE_INLINE_VIRTUAL_TRACE() { SQLStatementErrorCallback::trace(visitor); } |
| 152 | 152 |
| 153 bool handleEvent(SQLTransaction*, SQLError* error) override { | 153 bool handleEvent(SQLTransaction*, SQLError* error) override { |
| 154 m_requestCallback->reportTransactionFailed(error); | 154 m_requestCallback->reportTransactionFailed(error); |
| 155 return true; | 155 return true; |
| 156 } | 156 } |
| 157 | 157 |
| 158 private: | 158 private: |
| 159 StatementErrorCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) | 159 StatementErrorCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) |
| 160 : m_requestCallback(requestCallback) {} | 160 : m_requestCallback(std::move(requestCallback)) {} |
| 161 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; | 161 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; |
| 162 }; | 162 }; |
| 163 | 163 |
| 164 class TransactionCallback final : public SQLTransactionCallback { | 164 class TransactionCallback final : public SQLTransactionCallback { |
| 165 public: | 165 public: |
| 166 static TransactionCallback* create( | 166 static TransactionCallback* create( |
| 167 const String& sqlStatement, | 167 const String& sqlStatement, |
| 168 PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) { | 168 PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) { |
| 169 return new TransactionCallback(sqlStatement, std::move(requestCallback)); | 169 return new TransactionCallback(sqlStatement, std::move(requestCallback)); |
| 170 } | 170 } |
| 171 | 171 |
| 172 ~TransactionCallback() override {} | 172 ~TransactionCallback() override {} |
| 173 | 173 |
| 174 DEFINE_INLINE_VIRTUAL_TRACE() { SQLTransactionCallback::trace(visitor); } | 174 DEFINE_INLINE_VIRTUAL_TRACE() { SQLTransactionCallback::trace(visitor); } |
| 175 | 175 |
| 176 bool handleEvent(SQLTransaction* transaction) override { | 176 bool handleEvent(SQLTransaction* transaction) override { |
| 177 Vector<SQLValue> sqlValues; | 177 Vector<SQLValue> sqlValues; |
| 178 SQLStatementCallback* callback = | 178 SQLStatementCallback* callback = |
| 179 StatementCallback::create(m_requestCallback); | 179 StatementCallback::create(m_requestCallback); |
| 180 SQLStatementErrorCallback* errorCallback = | 180 SQLStatementErrorCallback* errorCallback = |
| 181 StatementErrorCallback::create(m_requestCallback); | 181 StatementErrorCallback::create(m_requestCallback); |
| 182 transaction->executeSQL(m_sqlStatement, sqlValues, callback, errorCallback, | 182 transaction->executeSQL(m_sqlStatement, sqlValues, callback, errorCallback, |
| 183 IGNORE_EXCEPTION_FOR_TESTING); | 183 IGNORE_EXCEPTION_FOR_TESTING); |
| 184 return true; | 184 return true; |
| 185 } | 185 } |
| 186 | 186 |
| 187 private: | 187 private: |
| 188 TransactionCallback(const String& sqlStatement, | 188 TransactionCallback(const String& sqlStatement, |
| 189 PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) | 189 PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) |
| 190 : m_sqlStatement(sqlStatement), m_requestCallback(requestCallback) {} | 190 : m_sqlStatement(sqlStatement), |
| 191 m_requestCallback(std::move(requestCallback)) {} |
| 191 String m_sqlStatement; | 192 String m_sqlStatement; |
| 192 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; | 193 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; |
| 193 }; | 194 }; |
| 194 | 195 |
| 195 class TransactionErrorCallback final : public SQLTransactionErrorCallback { | 196 class TransactionErrorCallback final : public SQLTransactionErrorCallback { |
| 196 public: | 197 public: |
| 197 static TransactionErrorCallback* create( | 198 static TransactionErrorCallback* create( |
| 198 PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) { | 199 PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) { |
| 199 return new TransactionErrorCallback(std::move(requestCallback)); | 200 return new TransactionErrorCallback(std::move(requestCallback)); |
| 200 } | 201 } |
| 201 | 202 |
| 202 ~TransactionErrorCallback() override {} | 203 ~TransactionErrorCallback() override {} |
| 203 | 204 |
| 204 DEFINE_INLINE_VIRTUAL_TRACE() { SQLTransactionErrorCallback::trace(visitor); } | 205 DEFINE_INLINE_VIRTUAL_TRACE() { SQLTransactionErrorCallback::trace(visitor); } |
| 205 | 206 |
| 206 bool handleEvent(SQLError* error) override { | 207 bool handleEvent(SQLError* error) override { |
| 207 m_requestCallback->reportTransactionFailed(error); | 208 m_requestCallback->reportTransactionFailed(error); |
| 208 return true; | 209 return true; |
| 209 } | 210 } |
| 210 | 211 |
| 211 private: | 212 private: |
| 212 TransactionErrorCallback( | 213 TransactionErrorCallback( |
| 213 PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) | 214 PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) |
| 214 : m_requestCallback(requestCallback) {} | 215 : m_requestCallback(std::move(requestCallback)) {} |
| 215 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; | 216 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; |
| 216 }; | 217 }; |
| 217 | 218 |
| 218 class TransactionSuccessCallback final : public VoidCallback { | 219 class TransactionSuccessCallback final : public VoidCallback { |
| 219 public: | 220 public: |
| 220 static TransactionSuccessCallback* create() { | 221 static TransactionSuccessCallback* create() { |
| 221 return new TransactionSuccessCallback(); | 222 return new TransactionSuccessCallback(); |
| 222 } | 223 } |
| 223 | 224 |
| 224 ~TransactionSuccessCallback() override {} | 225 ~TransactionSuccessCallback() override {} |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 return it->value->database(); | 365 return it->value->database(); |
| 365 } | 366 } |
| 366 | 367 |
| 367 DEFINE_TRACE(InspectorDatabaseAgent) { | 368 DEFINE_TRACE(InspectorDatabaseAgent) { |
| 368 visitor->trace(m_page); | 369 visitor->trace(m_page); |
| 369 visitor->trace(m_resources); | 370 visitor->trace(m_resources); |
| 370 InspectorBaseAgent::trace(visitor); | 371 InspectorBaseAgent::trace(visitor); |
| 371 } | 372 } |
| 372 | 373 |
| 373 } // namespace blink | 374 } // namespace blink |
| OLD | NEW |