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

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

Issue 219963019: Revert r170536 - "Rename DatabaseTaskSynchronizer to TaskSynchronizer ..." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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
« no previous file with comments | « Source/modules/webdatabase/Database.cpp ('k') | Source/modules/webdatabase/DatabaseContext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 49
50 void DatabaseBackend::trace(Visitor* visitor) 50 void DatabaseBackend::trace(Visitor* visitor)
51 { 51 {
52 visitor->trace(m_transactionQueue); 52 visitor->trace(m_transactionQueue);
53 DatabaseBackendBase::trace(visitor); 53 DatabaseBackendBase::trace(visitor);
54 } 54 }
55 55
56 bool DatabaseBackend::openAndVerifyVersion(bool setVersionInNewDatabase, Databas eError& error, String& errorMessage) 56 bool DatabaseBackend::openAndVerifyVersion(bool setVersionInNewDatabase, Databas eError& error, String& errorMessage)
57 { 57 {
58 TaskSynchronizer synchronizer; 58 DatabaseTaskSynchronizer synchronizer;
59 if (!databaseContext()->databaseThread() || databaseContext()->databaseThrea d()->terminationRequested(&synchronizer)) 59 if (!databaseContext()->databaseThread() || databaseContext()->databaseThrea d()->terminationRequested(&synchronizer))
60 return false; 60 return false;
61 61
62 DatabaseTracker::tracker().prepareToOpenDatabase(this); 62 DatabaseTracker::tracker().prepareToOpenDatabase(this);
63 bool success = false; 63 bool success = false;
64 OwnPtr<DatabaseOpenTask> task = DatabaseOpenTask::create(this, setVersionInN ewDatabase, &synchronizer, error, errorMessage, success); 64 OwnPtr<DatabaseOpenTask> task = DatabaseOpenTask::create(this, setVersionInN ewDatabase, &synchronizer, error, errorMessage, success);
65 databaseContext()->databaseThread()->scheduleTask(task.release()); 65 databaseContext()->databaseThread()->scheduleTask(task.release());
66 synchronizer.waitForTaskCompletion(); 66 synchronizer.waitForTaskCompletion();
67 67
68 return success; 68 return success;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 { 162 {
163 return databaseContext()->databaseThread()->transactionClient(); 163 return databaseContext()->databaseThread()->transactionClient();
164 } 164 }
165 165
166 SQLTransactionCoordinator* DatabaseBackend::transactionCoordinator() const 166 SQLTransactionCoordinator* DatabaseBackend::transactionCoordinator() const
167 { 167 {
168 return databaseContext()->databaseThread()->transactionCoordinator(); 168 return databaseContext()->databaseThread()->transactionCoordinator();
169 } 169 }
170 170
171 } // namespace WebCore 171 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/webdatabase/Database.cpp ('k') | Source/modules/webdatabase/DatabaseContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698