Chromium Code Reviews| 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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 208 , m_name(name.isolatedCopy()) | 208 , m_name(name.isolatedCopy()) |
| 209 , m_expectedVersion(expectedVersion.isolatedCopy()) | 209 , m_expectedVersion(expectedVersion.isolatedCopy()) |
| 210 , m_displayName(displayName.isolatedCopy()) | 210 , m_displayName(displayName.isolatedCopy()) |
| 211 , m_estimatedSize(estimatedSize) | 211 , m_estimatedSize(estimatedSize) |
| 212 , m_guid(0) | 212 , m_guid(0) |
| 213 , m_opened(0) | 213 , m_opened(0) |
| 214 , m_new(false) | 214 , m_new(false) |
| 215 , m_transactionInProgress(false) | 215 , m_transactionInProgress(false) |
| 216 , m_isTransactionQueueEnabled(true) | 216 , m_isTransactionQueueEnabled(true) |
| 217 { | 217 { |
| 218 ASSERT(isMainThread()); | |
|
haraken
2016/05/18 13:05:16
Use DCHECK.
keishi
2016/05/24 11:52:21
Done.
| |
| 218 m_contextThreadSecurityOrigin = m_databaseContext->getSecurityOrigin()->isol atedCopy(); | 219 m_contextThreadSecurityOrigin = m_databaseContext->getSecurityOrigin()->isol atedCopy(); |
| 219 | 220 |
| 220 m_databaseAuthorizer = DatabaseAuthorizer::create(infoTableName); | 221 m_databaseAuthorizer = DatabaseAuthorizer::create(infoTableName); |
| 221 | 222 |
| 222 if (m_name.isNull()) | 223 if (m_name.isNull()) |
| 223 m_name = ""; | 224 m_name = ""; |
| 224 | 225 |
| 225 { | 226 { |
| 226 SafePointAwareMutexLocker locker(guidMutex()); | 227 SafePointAwareMutexLocker locker(guidMutex()); |
| 227 m_guid = guidForOriginAndName(getSecurityOrigin()->toString(), name); | 228 m_guid = guidForOriginAndName(getSecurityOrigin()->toString(), name); |
| (...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 902 return m_databaseThreadSecurityOrigin.get(); | 903 return m_databaseThreadSecurityOrigin.get(); |
| 903 return 0; | 904 return 0; |
| 904 } | 905 } |
| 905 | 906 |
| 906 bool Database::opened() | 907 bool Database::opened() |
| 907 { | 908 { |
| 908 return static_cast<bool>(acquireLoad(&m_opened)); | 909 return static_cast<bool>(acquireLoad(&m_opened)); |
| 909 } | 910 } |
| 910 | 911 |
| 911 } // namespace blink | 912 } // namespace blink |
| OLD | NEW |