OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
837 #if ENABLE(ASSERT) | 837 #if ENABLE(ASSERT) |
838 SQLTransactionErrorCallback* originalErrorCallback = errorCallback; | 838 SQLTransactionErrorCallback* originalErrorCallback = errorCallback; |
839 #endif | 839 #endif |
840 SQLTransaction* transaction = SQLTransaction::create(this, callback, success
Callback, errorCallback, readOnly); | 840 SQLTransaction* transaction = SQLTransaction::create(this, callback, success
Callback, errorCallback, readOnly); |
841 SQLTransactionBackend* transactionBackend = runTransaction(transaction, read
Only, changeVersionData); | 841 SQLTransactionBackend* transactionBackend = runTransaction(transaction, read
Only, changeVersionData); |
842 if (!transactionBackend) { | 842 if (!transactionBackend) { |
843 SQLTransactionErrorCallback* callback = transaction->releaseErrorCallbac
k(); | 843 SQLTransactionErrorCallback* callback = transaction->releaseErrorCallbac
k(); |
844 ASSERT(callback == originalErrorCallback); | 844 ASSERT(callback == originalErrorCallback); |
845 if (callback) { | 845 if (callback) { |
846 OwnPtr<SQLErrorData> error = SQLErrorData::create(SQLError::UNKNOWN_
ERR, "database has been closed"); | 846 OwnPtr<SQLErrorData> error = SQLErrorData::create(SQLError::UNKNOWN_
ERR, "database has been closed"); |
847 executionContext()->postTask(FROM_HERE, createSameThreadTask(&callTr
ansactionErrorCallback, callback, error.release())); | 847 executionContext()->postTask(BLINK_FROM_HERE, createSameThreadTask(&
callTransactionErrorCallback, callback, error.release())); |
848 } | 848 } |
849 } | 849 } |
850 } | 850 } |
851 | 851 |
852 void Database::scheduleTransactionCallback(SQLTransaction* transaction) | 852 void Database::scheduleTransactionCallback(SQLTransaction* transaction) |
853 { | 853 { |
854 // The task is constructed in a database thread, and destructed in the | 854 // The task is constructed in a database thread, and destructed in the |
855 // context thread. | 855 // context thread. |
856 executionContext()->postTask(FROM_HERE, createCrossThreadTask(&SQLTransactio
n::performPendingCallback, transaction)); | 856 executionContext()->postTask(BLINK_FROM_HERE, createCrossThreadTask(&SQLTran
saction::performPendingCallback, transaction)); |
857 } | 857 } |
858 | 858 |
859 Vector<String> Database::performGetTableNames() | 859 Vector<String> Database::performGetTableNames() |
860 { | 860 { |
861 disableAuthorizer(); | 861 disableAuthorizer(); |
862 | 862 |
863 SQLiteStatement statement(sqliteDatabase(), "SELECT name FROM sqlite_master
WHERE type='table';"); | 863 SQLiteStatement statement(sqliteDatabase(), "SELECT name FROM sqlite_master
WHERE type='table';"); |
864 if (statement.prepare() != SQLResultOk) { | 864 if (statement.prepare() != SQLResultOk) { |
865 WTF_LOG_ERROR("Unable to retrieve list of tables for database %s", datab
aseDebugName().ascii().data()); | 865 WTF_LOG_ERROR("Unable to retrieve list of tables for database %s", datab
aseDebugName().ascii().data()); |
866 enableAuthorizer(); | 866 enableAuthorizer(); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
905 SecurityOrigin* Database::securityOrigin() const | 905 SecurityOrigin* Database::securityOrigin() const |
906 { | 906 { |
907 if (executionContext()->isContextThread()) | 907 if (executionContext()->isContextThread()) |
908 return m_contextThreadSecurityOrigin.get(); | 908 return m_contextThreadSecurityOrigin.get(); |
909 if (databaseContext()->databaseThread()->isDatabaseThread()) | 909 if (databaseContext()->databaseThread()->isDatabaseThread()) |
910 return m_databaseThreadSecurityOrigin.get(); | 910 return m_databaseThreadSecurityOrigin.get(); |
911 return 0; | 911 return 0; |
912 } | 912 } |
913 | 913 |
914 } // namespace blink | 914 } // namespace blink |
OLD | NEW |