Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side Diff: Source/modules/webdatabase/DatabaseContext.cpp

Issue 589363002: Oilpan: DatabaseThread::m_thread should not get destructed during sweeping (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 // stopDatabases(), we can't clear the m_databaseThread ref till we get to 171 // 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 172 // the destructor. This is because the Databases that are managed by
173 // DatabaseThread still rely on this ref between the context and the thread 173 // 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 174 // 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 175 // 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 176 // why our ref count is 0 then and we're destructing). Then, the
177 // m_databaseThread RefPtr destructor will deref and delete the 177 // m_databaseThread RefPtr destructor will deref and delete the
178 // DatabaseThread. 178 // DatabaseThread.
179 179
180 if (m_databaseThread && !m_hasRequestedTermination) { 180 if (m_databaseThread && !m_hasRequestedTermination) {
181 TaskSynchronizer sync; 181 // This blocks until the database thread finishes processing the cleanup task.
182 m_databaseThread->requestTermination(&sync); 182 m_databaseThread->terminate();
183 m_hasRequestedTermination = true; 183 m_hasRequestedTermination = true;
184 sync.waitForTaskCompletion();
185 } 184 }
186 } 185 }
187 186
188 bool DatabaseContext::allowDatabaseAccess() const 187 bool DatabaseContext::allowDatabaseAccess() const
189 { 188 {
190 return toDocument(executionContext())->isActive(); 189 return toDocument(executionContext())->isActive();
191 } 190 }
192 191
193 SecurityOrigin* DatabaseContext::securityOrigin() const 192 SecurityOrigin* DatabaseContext::securityOrigin() const
194 { 193 {
195 return executionContext()->securityOrigin(); 194 return executionContext()->securityOrigin();
196 } 195 }
197 196
198 bool DatabaseContext::isContextThread() const 197 bool DatabaseContext::isContextThread() const
199 { 198 {
200 return executionContext()->isContextThread(); 199 return executionContext()->isContextThread();
201 } 200 }
202 201
203 } // namespace blink 202 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/modules/webdatabase/DatabaseThread.h » ('j') | Source/modules/webdatabase/DatabaseThread.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698