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

Side by Side Diff: Source/WebCore/storage/AbstractDatabase.cpp

Issue 9255031: Merge 103429 - Source/WebCore: [Chromium] DatabaseTrackerChromium: iterating DatabaseSet races wi... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 * 7 *
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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 216
217 hashSet->add(this); 217 hashSet->add(this);
218 } 218 }
219 219
220 m_filename = DatabaseTracker::tracker().fullPathForDatabase(securityOrigin() , m_name); 220 m_filename = DatabaseTracker::tracker().fullPathForDatabase(securityOrigin() , m_name);
221 DatabaseTracker::tracker().addOpenDatabase(this); 221 DatabaseTracker::tracker().addOpenDatabase(this);
222 } 222 }
223 223
224 AbstractDatabase::~AbstractDatabase() 224 AbstractDatabase::~AbstractDatabase()
225 { 225 {
226 ASSERT(!m_opened);
226 } 227 }
227 228
228 void AbstractDatabase::closeDatabase() 229 void AbstractDatabase::closeDatabase()
229 { 230 {
230 if (!m_opened) 231 if (!m_opened)
231 return; 232 return;
232 233
233 m_sqliteDatabase.close(); 234 m_sqliteDatabase.close();
234 m_opened = false; 235 m_opened = false;
235 { 236 {
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 void AbstractDatabase::reportChangeVersionResult(int, int, int) { } 606 void AbstractDatabase::reportChangeVersionResult(int, int, int) { }
606 void AbstractDatabase::reportStartTransactionResult(int, int, int) { } 607 void AbstractDatabase::reportStartTransactionResult(int, int, int) { }
607 void AbstractDatabase::reportCommitTransactionResult(int, int, int) { } 608 void AbstractDatabase::reportCommitTransactionResult(int, int, int) { }
608 void AbstractDatabase::reportExecuteStatementResult(int, int, int) { } 609 void AbstractDatabase::reportExecuteStatementResult(int, int, int) { }
609 void AbstractDatabase::reportVacuumDatabaseResult(int) { } 610 void AbstractDatabase::reportVacuumDatabaseResult(int) { }
610 #endif // PLATFORM(CHROMIUM) 611 #endif // PLATFORM(CHROMIUM)
611 612
612 } // namespace WebCore 613 } // namespace WebCore
613 614
614 #endif // ENABLE(SQL_DATABASE) 615 #endif // ENABLE(SQL_DATABASE)
OLDNEW
« no previous file with comments | « LayoutTests/platform/chromium/test_expectations.txt ('k') | Source/WebCore/storage/chromium/DatabaseTrackerChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698