| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2013 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 // and hence we should also close it on that same thread. This means that th
e | 243 // and hence we should also close it on that same thread. This means that th
e |
| 244 // SQLite database need to be closed by another mechanism (see | 244 // SQLite database need to be closed by another mechanism (see |
| 245 // DatabaseContext::stopDatabases()). By the time we get here, the SQLite | 245 // DatabaseContext::stopDatabases()). By the time we get here, the SQLite |
| 246 // database should have already been closed. | 246 // database should have already been closed. |
| 247 | 247 |
| 248 ASSERT(!m_opened); | 248 ASSERT(!m_opened); |
| 249 } | 249 } |
| 250 | 250 |
| 251 void DatabaseBackendBase::trace(Visitor* visitor) | 251 void DatabaseBackendBase::trace(Visitor* visitor) |
| 252 { | 252 { |
| 253 visitor->trace(m_databaseContext); |
| 253 visitor->trace(m_sqliteDatabase); | 254 visitor->trace(m_sqliteDatabase); |
| 254 visitor->trace(m_databaseAuthorizer); | 255 visitor->trace(m_databaseAuthorizer); |
| 255 } | 256 } |
| 256 | 257 |
| 257 void DatabaseBackendBase::closeDatabase() | 258 void DatabaseBackendBase::closeDatabase() |
| 258 { | 259 { |
| 259 if (!m_opened) | 260 if (!m_opened) |
| 260 return; | 261 return; |
| 261 | 262 |
| 262 m_sqliteDatabase.close(); | 263 m_sqliteDatabase.close(); |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 { | 666 { |
| 666 executionContext()->addConsoleMessage(StorageMessageSource, ErrorMessageLeve
l, message); | 667 executionContext()->addConsoleMessage(StorageMessageSource, ErrorMessageLeve
l, message); |
| 667 } | 668 } |
| 668 | 669 |
| 669 ExecutionContext* DatabaseBackendBase::executionContext() const | 670 ExecutionContext* DatabaseBackendBase::executionContext() const |
| 670 { | 671 { |
| 671 return databaseContext()->executionContext(); | 672 return databaseContext()->executionContext(); |
| 672 } | 673 } |
| 673 | 674 |
| 674 } // namespace WebCore | 675 } // namespace WebCore |
| OLD | NEW |