| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 requestCallback->sendSuccess(nullptr, nullptr, errorObject.release()); | 68 requestCallback->sendSuccess(nullptr, nullptr, errorObject.release()); |
| 69 } | 69 } |
| 70 | 70 |
| 71 class StatementCallback final : public SQLStatementCallback { | 71 class StatementCallback final : public SQLStatementCallback { |
| 72 public: | 72 public: |
| 73 static StatementCallback* create(PassRefPtrWillBeRawPtr<ExecuteSQLCallback>
requestCallback) | 73 static StatementCallback* create(PassRefPtrWillBeRawPtr<ExecuteSQLCallback>
requestCallback) |
| 74 { | 74 { |
| 75 return new StatementCallback(requestCallback); | 75 return new StatementCallback(requestCallback); |
| 76 } | 76 } |
| 77 | 77 |
| 78 virtual ~StatementCallback() { } | 78 ~StatementCallback() override { } |
| 79 | 79 |
| 80 DEFINE_INLINE_VIRTUAL_TRACE() | 80 DEFINE_INLINE_VIRTUAL_TRACE() |
| 81 { | 81 { |
| 82 visitor->trace(m_requestCallback); | 82 visitor->trace(m_requestCallback); |
| 83 SQLStatementCallback::trace(visitor); | 83 SQLStatementCallback::trace(visitor); |
| 84 } | 84 } |
| 85 | 85 |
| 86 virtual bool handleEvent(SQLTransaction*, SQLResultSet* resultSet) override | 86 bool handleEvent(SQLTransaction*, SQLResultSet* resultSet) override |
| 87 { | 87 { |
| 88 SQLResultSetRowList* rowList = resultSet->rows(); | 88 SQLResultSetRowList* rowList = resultSet->rows(); |
| 89 | 89 |
| 90 RefPtr<TypeBuilder::Array<String>> columnNames = TypeBuilder::Array<Stri
ng>::create(); | 90 RefPtr<TypeBuilder::Array<String>> columnNames = TypeBuilder::Array<Stri
ng>::create(); |
| 91 const Vector<String>& columns = rowList->columnNames(); | 91 const Vector<String>& columns = rowList->columnNames(); |
| 92 for (size_t i = 0; i < columns.size(); ++i) | 92 for (size_t i = 0; i < columns.size(); ++i) |
| 93 columnNames->addItem(columns[i]); | 93 columnNames->addItem(columns[i]); |
| 94 | 94 |
| 95 RefPtr<TypeBuilder::Array<JSONValue>> values = TypeBuilder::Array<JSONVa
lue>::create(); | 95 RefPtr<TypeBuilder::Array<JSONValue>> values = TypeBuilder::Array<JSONVa
lue>::create(); |
| 96 const Vector<SQLValue>& data = rowList->values(); | 96 const Vector<SQLValue>& data = rowList->values(); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 112 RefPtrWillBeMember<ExecuteSQLCallback> m_requestCallback; | 112 RefPtrWillBeMember<ExecuteSQLCallback> m_requestCallback; |
| 113 }; | 113 }; |
| 114 | 114 |
| 115 class StatementErrorCallback final : public SQLStatementErrorCallback { | 115 class StatementErrorCallback final : public SQLStatementErrorCallback { |
| 116 public: | 116 public: |
| 117 static StatementErrorCallback* create(PassRefPtrWillBeRawPtr<ExecuteSQLCallb
ack> requestCallback) | 117 static StatementErrorCallback* create(PassRefPtrWillBeRawPtr<ExecuteSQLCallb
ack> requestCallback) |
| 118 { | 118 { |
| 119 return new StatementErrorCallback(requestCallback); | 119 return new StatementErrorCallback(requestCallback); |
| 120 } | 120 } |
| 121 | 121 |
| 122 virtual ~StatementErrorCallback() { } | 122 ~StatementErrorCallback() override { } |
| 123 | 123 |
| 124 DEFINE_INLINE_VIRTUAL_TRACE() | 124 DEFINE_INLINE_VIRTUAL_TRACE() |
| 125 { | 125 { |
| 126 visitor->trace(m_requestCallback); | 126 visitor->trace(m_requestCallback); |
| 127 SQLStatementErrorCallback::trace(visitor); | 127 SQLStatementErrorCallback::trace(visitor); |
| 128 } | 128 } |
| 129 | 129 |
| 130 virtual bool handleEvent(SQLTransaction*, SQLError* error) override | 130 bool handleEvent(SQLTransaction*, SQLError* error) override |
| 131 { | 131 { |
| 132 reportTransactionFailed(m_requestCallback.get(), error); | 132 reportTransactionFailed(m_requestCallback.get(), error); |
| 133 return true; | 133 return true; |
| 134 } | 134 } |
| 135 | 135 |
| 136 private: | 136 private: |
| 137 StatementErrorCallback(PassRefPtrWillBeRawPtr<ExecuteSQLCallback> requestCal
lback) | 137 StatementErrorCallback(PassRefPtrWillBeRawPtr<ExecuteSQLCallback> requestCal
lback) |
| 138 : m_requestCallback(requestCallback) { } | 138 : m_requestCallback(requestCallback) { } |
| 139 RefPtrWillBeMember<ExecuteSQLCallback> m_requestCallback; | 139 RefPtrWillBeMember<ExecuteSQLCallback> m_requestCallback; |
| 140 }; | 140 }; |
| 141 | 141 |
| 142 class TransactionCallback final : public SQLTransactionCallback { | 142 class TransactionCallback final : public SQLTransactionCallback { |
| 143 public: | 143 public: |
| 144 static TransactionCallback* create(const String& sqlStatement, PassRefPtrWil
lBeRawPtr<ExecuteSQLCallback> requestCallback) | 144 static TransactionCallback* create(const String& sqlStatement, PassRefPtrWil
lBeRawPtr<ExecuteSQLCallback> requestCallback) |
| 145 { | 145 { |
| 146 return new TransactionCallback(sqlStatement, requestCallback); | 146 return new TransactionCallback(sqlStatement, requestCallback); |
| 147 } | 147 } |
| 148 | 148 |
| 149 virtual ~TransactionCallback() { } | 149 ~TransactionCallback() override { } |
| 150 | 150 |
| 151 DEFINE_INLINE_VIRTUAL_TRACE() | 151 DEFINE_INLINE_VIRTUAL_TRACE() |
| 152 { | 152 { |
| 153 visitor->trace(m_requestCallback); | 153 visitor->trace(m_requestCallback); |
| 154 SQLTransactionCallback::trace(visitor); | 154 SQLTransactionCallback::trace(visitor); |
| 155 } | 155 } |
| 156 | 156 |
| 157 virtual bool handleEvent(SQLTransaction* transaction) override | 157 bool handleEvent(SQLTransaction* transaction) override |
| 158 { | 158 { |
| 159 if (!m_requestCallback->isActive()) | 159 if (!m_requestCallback->isActive()) |
| 160 return true; | 160 return true; |
| 161 | 161 |
| 162 Vector<SQLValue> sqlValues; | 162 Vector<SQLValue> sqlValues; |
| 163 SQLStatementCallback* callback = StatementCallback::create(m_requestCall
back.get()); | 163 SQLStatementCallback* callback = StatementCallback::create(m_requestCall
back.get()); |
| 164 SQLStatementErrorCallback* errorCallback = StatementErrorCallback::creat
e(m_requestCallback.get()); | 164 SQLStatementErrorCallback* errorCallback = StatementErrorCallback::creat
e(m_requestCallback.get()); |
| 165 transaction->executeSQL(m_sqlStatement, sqlValues, callback, errorCallba
ck, IGNORE_EXCEPTION); | 165 transaction->executeSQL(m_sqlStatement, sqlValues, callback, errorCallba
ck, IGNORE_EXCEPTION); |
| 166 return true; | 166 return true; |
| 167 } | 167 } |
| 168 private: | 168 private: |
| 169 TransactionCallback(const String& sqlStatement, PassRefPtrWillBeRawPtr<Execu
teSQLCallback> requestCallback) | 169 TransactionCallback(const String& sqlStatement, PassRefPtrWillBeRawPtr<Execu
teSQLCallback> requestCallback) |
| 170 : m_sqlStatement(sqlStatement) | 170 : m_sqlStatement(sqlStatement) |
| 171 , m_requestCallback(requestCallback) { } | 171 , m_requestCallback(requestCallback) { } |
| 172 String m_sqlStatement; | 172 String m_sqlStatement; |
| 173 RefPtrWillBeMember<ExecuteSQLCallback> m_requestCallback; | 173 RefPtrWillBeMember<ExecuteSQLCallback> m_requestCallback; |
| 174 }; | 174 }; |
| 175 | 175 |
| 176 class TransactionErrorCallback final : public SQLTransactionErrorCallback { | 176 class TransactionErrorCallback final : public SQLTransactionErrorCallback { |
| 177 public: | 177 public: |
| 178 static TransactionErrorCallback* create(PassRefPtrWillBeRawPtr<ExecuteSQLCal
lback> requestCallback) | 178 static TransactionErrorCallback* create(PassRefPtrWillBeRawPtr<ExecuteSQLCal
lback> requestCallback) |
| 179 { | 179 { |
| 180 return new TransactionErrorCallback(requestCallback); | 180 return new TransactionErrorCallback(requestCallback); |
| 181 } | 181 } |
| 182 | 182 |
| 183 virtual ~TransactionErrorCallback() { } | 183 ~TransactionErrorCallback() override { } |
| 184 | 184 |
| 185 DEFINE_INLINE_VIRTUAL_TRACE() | 185 DEFINE_INLINE_VIRTUAL_TRACE() |
| 186 { | 186 { |
| 187 visitor->trace(m_requestCallback); | 187 visitor->trace(m_requestCallback); |
| 188 SQLTransactionErrorCallback::trace(visitor); | 188 SQLTransactionErrorCallback::trace(visitor); |
| 189 } | 189 } |
| 190 | 190 |
| 191 virtual bool handleEvent(SQLError* error) override | 191 bool handleEvent(SQLError* error) override |
| 192 { | 192 { |
| 193 reportTransactionFailed(m_requestCallback.get(), error); | 193 reportTransactionFailed(m_requestCallback.get(), error); |
| 194 return true; | 194 return true; |
| 195 } | 195 } |
| 196 private: | 196 private: |
| 197 TransactionErrorCallback(PassRefPtrWillBeRawPtr<ExecuteSQLCallback> requestC
allback) | 197 TransactionErrorCallback(PassRefPtrWillBeRawPtr<ExecuteSQLCallback> requestC
allback) |
| 198 : m_requestCallback(requestCallback) { } | 198 : m_requestCallback(requestCallback) { } |
| 199 RefPtrWillBeMember<ExecuteSQLCallback> m_requestCallback; | 199 RefPtrWillBeMember<ExecuteSQLCallback> m_requestCallback; |
| 200 }; | 200 }; |
| 201 | 201 |
| 202 class TransactionSuccessCallback final : public VoidCallback { | 202 class TransactionSuccessCallback final : public VoidCallback { |
| 203 public: | 203 public: |
| 204 static TransactionSuccessCallback* create() | 204 static TransactionSuccessCallback* create() |
| 205 { | 205 { |
| 206 return new TransactionSuccessCallback(); | 206 return new TransactionSuccessCallback(); |
| 207 } | 207 } |
| 208 | 208 |
| 209 virtual ~TransactionSuccessCallback() { } | 209 ~TransactionSuccessCallback() override { } |
| 210 | 210 |
| 211 virtual void handleEvent() override { } | 211 void handleEvent() override { } |
| 212 | 212 |
| 213 private: | 213 private: |
| 214 TransactionSuccessCallback() { } | 214 TransactionSuccessCallback() { } |
| 215 }; | 215 }; |
| 216 | 216 |
| 217 } // namespace | 217 } // namespace |
| 218 | 218 |
| 219 void InspectorDatabaseAgent::didOpenDatabase(Database* database, const String& d
omain, const String& name, const String& version) | 219 void InspectorDatabaseAgent::didOpenDatabase(Database* database, const String& d
omain, const String& name, const String& version) |
| 220 { | 220 { |
| 221 if (InspectorDatabaseResource* resource = findByFileName(database->fileName(
))) { | 221 if (InspectorDatabaseResource* resource = findByFileName(database->fileName(
))) { |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 | 334 |
| 335 DEFINE_TRACE(InspectorDatabaseAgent) | 335 DEFINE_TRACE(InspectorDatabaseAgent) |
| 336 { | 336 { |
| 337 #if ENABLE(OILPAN) | 337 #if ENABLE(OILPAN) |
| 338 visitor->trace(m_resources); | 338 visitor->trace(m_resources); |
| 339 #endif | 339 #endif |
| 340 InspectorBaseAgent::trace(visitor); | 340 InspectorBaseAgent::trace(visitor); |
| 341 } | 341 } |
| 342 | 342 |
| 343 } // namespace blink | 343 } // namespace blink |
| OLD | NEW |