| 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 m_databaseContext->getSecurityOrigin()->isolatedCopy(); | 231 m_databaseContext->getSecurityOrigin()->isolatedCopy(); |
| 232 | 232 |
| 233 m_databaseAuthorizer = DatabaseAuthorizer::create(infoTableName); | 233 m_databaseAuthorizer = DatabaseAuthorizer::create(infoTableName); |
| 234 | 234 |
| 235 if (m_name.isNull()) | 235 if (m_name.isNull()) |
| 236 m_name = ""; | 236 m_name = ""; |
| 237 | 237 |
| 238 { | 238 { |
| 239 MutexLocker locker(guidMutex()); | 239 MutexLocker locker(guidMutex()); |
| 240 m_guid = guidForOriginAndName(getSecurityOrigin()->toString(), name); | 240 m_guid = guidForOriginAndName(getSecurityOrigin()->toString(), name); |
| 241 guidCount().add(m_guid); | 241 guidCount().insert(m_guid); |
| 242 } | 242 } |
| 243 | 243 |
| 244 m_filename = DatabaseManager::manager().fullPathForDatabase( | 244 m_filename = DatabaseManager::manager().fullPathForDatabase( |
| 245 getSecurityOrigin(), m_name); | 245 getSecurityOrigin(), m_name); |
| 246 | 246 |
| 247 m_databaseThreadSecurityOrigin = | 247 m_databaseThreadSecurityOrigin = |
| 248 m_contextThreadSecurityOrigin->isolatedCopy(); | 248 m_contextThreadSecurityOrigin->isolatedCopy(); |
| 249 ASSERT(m_databaseContext->databaseThread()); | 249 ASSERT(m_databaseContext->databaseThread()); |
| 250 ASSERT(m_databaseContext->isContextThread()); | 250 ASSERT(m_databaseContext->isContextThread()); |
| 251 m_databaseTaskRunner = | 251 m_databaseTaskRunner = |
| (...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 950 | 950 |
| 951 bool Database::opened() { | 951 bool Database::opened() { |
| 952 return static_cast<bool>(acquireLoad(&m_opened)); | 952 return static_cast<bool>(acquireLoad(&m_opened)); |
| 953 } | 953 } |
| 954 | 954 |
| 955 WebTaskRunner* Database::getDatabaseTaskRunner() const { | 955 WebTaskRunner* Database::getDatabaseTaskRunner() const { |
| 956 return m_databaseTaskRunner.get(); | 956 return m_databaseTaskRunner.get(); |
| 957 } | 957 } |
| 958 | 958 |
| 959 } // namespace blink | 959 } // namespace blink |
| OLD | NEW |