OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
3 * Copyright (C) 2011 Google, Inc. All Rights Reserved. | 3 * Copyright (C) 2011 Google, 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 * 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 147 matching lines...) Loading... |
158 | 158 |
159 // Create the database thread on first request - but not if at least one
database was already opened, | 159 // Create the database thread on first request - but not if at least one
database was already opened, |
160 // because in that case we already had a database thread and terminated
it and should not create another. | 160 // because in that case we already had a database thread and terminated
it and should not create another. |
161 m_databaseThread = DatabaseThread::create(); | 161 m_databaseThread = DatabaseThread::create(); |
162 m_databaseThread->start(); | 162 m_databaseThread->start(); |
163 } | 163 } |
164 | 164 |
165 return m_databaseThread.get(); | 165 return m_databaseThread.get(); |
166 } | 166 } |
167 | 167 |
| 168 bool DatabaseContext::databaseThreadAvailable() |
| 169 { |
| 170 return databaseThread() && !m_hasRequestedTermination; |
| 171 } |
| 172 |
168 void DatabaseContext::stopDatabases() | 173 void DatabaseContext::stopDatabases() |
169 { | 174 { |
170 // Though we initiate termination of the DatabaseThread here in | 175 // Though we initiate termination of the DatabaseThread here in |
171 // stopDatabases(), we can't clear the m_databaseThread ref till we get to | 176 // stopDatabases(), we can't clear the m_databaseThread ref till we get to |
172 // the destructor. This is because the Databases that are managed by | 177 // the destructor. This is because the Databases that are managed by |
173 // DatabaseThread still rely on this ref between the context and the thread | 178 // DatabaseThread still rely on this ref between the context and the thread |
174 // to execute the task for closing the database. By the time we get to the | 179 // to execute the task for closing the database. By the time we get to the |
175 // destructor, we're guaranteed that the databases are destructed (which is | 180 // destructor, we're guaranteed that the databases are destructed (which is |
176 // why our ref count is 0 then and we're destructing). Then, the | 181 // why our ref count is 0 then and we're destructing). Then, the |
177 // m_databaseThread RefPtr destructor will deref and delete the | 182 // m_databaseThread RefPtr destructor will deref and delete the |
178 // DatabaseThread. | 183 // DatabaseThread. |
179 | 184 |
180 if (m_databaseThread && !m_hasRequestedTermination) { | 185 if (databaseThreadAvailable()) { |
181 TaskSynchronizer sync; | 186 TaskSynchronizer sync; |
182 m_databaseThread->requestTermination(&sync); | 187 m_databaseThread->requestTermination(&sync); |
183 m_hasRequestedTermination = true; | 188 m_hasRequestedTermination = true; |
184 sync.waitForTaskCompletion(); | 189 sync.waitForTaskCompletion(); |
185 } | 190 } |
186 } | 191 } |
187 | 192 |
188 bool DatabaseContext::allowDatabaseAccess() const | 193 bool DatabaseContext::allowDatabaseAccess() const |
189 { | 194 { |
190 return toDocument(executionContext())->isActive(); | 195 return toDocument(executionContext())->isActive(); |
191 } | 196 } |
192 | 197 |
193 SecurityOrigin* DatabaseContext::securityOrigin() const | 198 SecurityOrigin* DatabaseContext::securityOrigin() const |
194 { | 199 { |
195 return executionContext()->securityOrigin(); | 200 return executionContext()->securityOrigin(); |
196 } | 201 } |
197 | 202 |
198 bool DatabaseContext::isContextThread() const | 203 bool DatabaseContext::isContextThread() const |
199 { | 204 { |
200 return executionContext()->isContextThread(); | 205 return executionContext()->isContextThread(); |
201 } | 206 } |
202 | 207 |
203 } // namespace blink | 208 } // namespace blink |
OLD | NEW |