| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 | 75 |
| 76 private: | 76 private: |
| 77 explicit ExecuteSQLCallbackWrapper(std::unique_ptr<ExecuteSQLCallback> callb
ack) : m_callback(std::move(callback)) { } | 77 explicit ExecuteSQLCallbackWrapper(std::unique_ptr<ExecuteSQLCallback> callb
ack) : m_callback(std::move(callback)) { } |
| 78 std::unique_ptr<ExecuteSQLCallback> m_callback; | 78 std::unique_ptr<ExecuteSQLCallback> m_callback; |
| 79 }; | 79 }; |
| 80 | 80 |
| 81 class StatementCallback final : public SQLStatementCallback { | 81 class StatementCallback final : public SQLStatementCallback { |
| 82 public: | 82 public: |
| 83 static StatementCallback* create(PassRefPtr<ExecuteSQLCallbackWrapper> reque
stCallback) | 83 static StatementCallback* create(PassRefPtr<ExecuteSQLCallbackWrapper> reque
stCallback) |
| 84 { | 84 { |
| 85 return new StatementCallback(requestCallback); | 85 return new StatementCallback(std::move(requestCallback)); |
| 86 } | 86 } |
| 87 | 87 |
| 88 ~StatementCallback() override { } | 88 ~StatementCallback() override { } |
| 89 | 89 |
| 90 DEFINE_INLINE_VIRTUAL_TRACE() | 90 DEFINE_INLINE_VIRTUAL_TRACE() |
| 91 { | 91 { |
| 92 SQLStatementCallback::trace(visitor); | 92 SQLStatementCallback::trace(visitor); |
| 93 } | 93 } |
| 94 | 94 |
| 95 bool handleEvent(SQLTransaction*, SQLResultSet* resultSet) override | 95 bool handleEvent(SQLTransaction*, SQLResultSet* resultSet) override |
| (...skipping 21 matching lines...) Expand all Loading... |
| 117 | 117 |
| 118 private: | 118 private: |
| 119 StatementCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) : m
_requestCallback(requestCallback) { } | 119 StatementCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback) : m
_requestCallback(requestCallback) { } |
| 120 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; | 120 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; |
| 121 }; | 121 }; |
| 122 | 122 |
| 123 class StatementErrorCallback final : public SQLStatementErrorCallback { | 123 class StatementErrorCallback final : public SQLStatementErrorCallback { |
| 124 public: | 124 public: |
| 125 static StatementErrorCallback* create(PassRefPtr<ExecuteSQLCallbackWrapper>
requestCallback) | 125 static StatementErrorCallback* create(PassRefPtr<ExecuteSQLCallbackWrapper>
requestCallback) |
| 126 { | 126 { |
| 127 return new StatementErrorCallback(requestCallback); | 127 return new StatementErrorCallback(std::move(requestCallback)); |
| 128 } | 128 } |
| 129 | 129 |
| 130 ~StatementErrorCallback() override { } | 130 ~StatementErrorCallback() override { } |
| 131 | 131 |
| 132 DEFINE_INLINE_VIRTUAL_TRACE() | 132 DEFINE_INLINE_VIRTUAL_TRACE() |
| 133 { | 133 { |
| 134 SQLStatementErrorCallback::trace(visitor); | 134 SQLStatementErrorCallback::trace(visitor); |
| 135 } | 135 } |
| 136 | 136 |
| 137 bool handleEvent(SQLTransaction*, SQLError* error) override | 137 bool handleEvent(SQLTransaction*, SQLError* error) override |
| 138 { | 138 { |
| 139 m_requestCallback->reportTransactionFailed(error); | 139 m_requestCallback->reportTransactionFailed(error); |
| 140 return true; | 140 return true; |
| 141 } | 141 } |
| 142 | 142 |
| 143 private: | 143 private: |
| 144 StatementErrorCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback
) : m_requestCallback(requestCallback) { } | 144 StatementErrorCallback(PassRefPtr<ExecuteSQLCallbackWrapper> requestCallback
) : m_requestCallback(requestCallback) { } |
| 145 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; | 145 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; |
| 146 }; | 146 }; |
| 147 | 147 |
| 148 class TransactionCallback final : public SQLTransactionCallback { | 148 class TransactionCallback final : public SQLTransactionCallback { |
| 149 public: | 149 public: |
| 150 static TransactionCallback* create(const String& sqlStatement, PassRefPtr<Ex
ecuteSQLCallbackWrapper> requestCallback) | 150 static TransactionCallback* create(const String& sqlStatement, PassRefPtr<Ex
ecuteSQLCallbackWrapper> requestCallback) |
| 151 { | 151 { |
| 152 return new TransactionCallback(sqlStatement, requestCallback); | 152 return new TransactionCallback(sqlStatement, std::move(requestCallback))
; |
| 153 } | 153 } |
| 154 | 154 |
| 155 ~TransactionCallback() override { } | 155 ~TransactionCallback() override { } |
| 156 | 156 |
| 157 DEFINE_INLINE_VIRTUAL_TRACE() | 157 DEFINE_INLINE_VIRTUAL_TRACE() |
| 158 { | 158 { |
| 159 SQLTransactionCallback::trace(visitor); | 159 SQLTransactionCallback::trace(visitor); |
| 160 } | 160 } |
| 161 | 161 |
| 162 bool handleEvent(SQLTransaction* transaction) override | 162 bool handleEvent(SQLTransaction* transaction) override |
| 163 { | 163 { |
| 164 Vector<SQLValue> sqlValues; | 164 Vector<SQLValue> sqlValues; |
| 165 SQLStatementCallback* callback = StatementCallback::create(m_requestCall
back); | 165 SQLStatementCallback* callback = StatementCallback::create(m_requestCall
back); |
| 166 SQLStatementErrorCallback* errorCallback = StatementErrorCallback::creat
e(m_requestCallback); | 166 SQLStatementErrorCallback* errorCallback = StatementErrorCallback::creat
e(m_requestCallback); |
| 167 transaction->executeSQL(m_sqlStatement, sqlValues, callback, errorCallba
ck, IGNORE_EXCEPTION); | 167 transaction->executeSQL(m_sqlStatement, sqlValues, callback, errorCallba
ck, IGNORE_EXCEPTION); |
| 168 return true; | 168 return true; |
| 169 } | 169 } |
| 170 private: | 170 private: |
| 171 TransactionCallback(const String& sqlStatement, PassRefPtr<ExecuteSQLCallbac
kWrapper> requestCallback) | 171 TransactionCallback(const String& sqlStatement, PassRefPtr<ExecuteSQLCallbac
kWrapper> requestCallback) |
| 172 : m_sqlStatement(sqlStatement) | 172 : m_sqlStatement(sqlStatement) |
| 173 , m_requestCallback(requestCallback) { } | 173 , m_requestCallback(requestCallback) { } |
| 174 String m_sqlStatement; | 174 String m_sqlStatement; |
| 175 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; | 175 RefPtr<ExecuteSQLCallbackWrapper> m_requestCallback; |
| 176 }; | 176 }; |
| 177 | 177 |
| 178 class TransactionErrorCallback final : public SQLTransactionErrorCallback { | 178 class TransactionErrorCallback final : public SQLTransactionErrorCallback { |
| 179 public: | 179 public: |
| 180 static TransactionErrorCallback* create(PassRefPtr<ExecuteSQLCallbackWrapper
> requestCallback) | 180 static TransactionErrorCallback* create(PassRefPtr<ExecuteSQLCallbackWrapper
> requestCallback) |
| 181 { | 181 { |
| 182 return new TransactionErrorCallback(requestCallback); | 182 return new TransactionErrorCallback(std::move(requestCallback)); |
| 183 } | 183 } |
| 184 | 184 |
| 185 ~TransactionErrorCallback() override { } | 185 ~TransactionErrorCallback() override { } |
| 186 | 186 |
| 187 DEFINE_INLINE_VIRTUAL_TRACE() | 187 DEFINE_INLINE_VIRTUAL_TRACE() |
| 188 { | 188 { |
| 189 SQLTransactionErrorCallback::trace(visitor); | 189 SQLTransactionErrorCallback::trace(visitor); |
| 190 } | 190 } |
| 191 | 191 |
| 192 bool handleEvent(SQLError* error) override | 192 bool handleEvent(SQLError* error) override |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 } | 343 } |
| 344 | 344 |
| 345 DEFINE_TRACE(InspectorDatabaseAgent) | 345 DEFINE_TRACE(InspectorDatabaseAgent) |
| 346 { | 346 { |
| 347 visitor->trace(m_page); | 347 visitor->trace(m_page); |
| 348 visitor->trace(m_resources); | 348 visitor->trace(m_resources); |
| 349 InspectorBaseAgent::trace(visitor); | 349 InspectorBaseAgent::trace(visitor); |
| 350 } | 350 } |
| 351 | 351 |
| 352 } // namespace blink | 352 } // namespace blink |
| OLD | NEW |