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

Side by Side Diff: third_party/WebKit/Source/modules/webdatabase/DatabaseTask.h

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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) 2007, 2008, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 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 * 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 }; 71 };
72 72
73 class Database::DatabaseOpenTask final : public DatabaseTask { 73 class Database::DatabaseOpenTask final : public DatabaseTask {
74 public: 74 public:
75 static std::unique_ptr<DatabaseOpenTask> create(Database* db, 75 static std::unique_ptr<DatabaseOpenTask> create(Database* db,
76 bool setVersionInNewDatabase, 76 bool setVersionInNewDatabase,
77 WaitableEvent* completeEvent, 77 WaitableEvent* completeEvent,
78 DatabaseError& error, 78 DatabaseError& error,
79 String& errorMessage, 79 String& errorMessage,
80 bool& success) { 80 bool& success) {
81 return wrapUnique(new DatabaseOpenTask(db, setVersionInNewDatabase, 81 return WTF::wrapUnique(new DatabaseOpenTask(db, setVersionInNewDatabase,
82 completeEvent, error, errorMessage, 82 completeEvent, error,
83 success)); 83 errorMessage, success));
84 } 84 }
85 85
86 private: 86 private:
87 DatabaseOpenTask(Database*, 87 DatabaseOpenTask(Database*,
88 bool setVersionInNewDatabase, 88 bool setVersionInNewDatabase,
89 WaitableEvent*, 89 WaitableEvent*,
90 DatabaseError&, 90 DatabaseError&,
91 String& errorMessage, 91 String& errorMessage,
92 bool& success); 92 bool& success);
93 93
94 void doPerformTask() override; 94 void doPerformTask() override;
95 #if DCHECK_IS_ON() 95 #if DCHECK_IS_ON()
96 const char* debugTaskName() const override; 96 const char* debugTaskName() const override;
97 #endif 97 #endif
98 98
99 bool m_setVersionInNewDatabase; 99 bool m_setVersionInNewDatabase;
100 DatabaseError& m_error; 100 DatabaseError& m_error;
101 String& m_errorMessage; 101 String& m_errorMessage;
102 bool& m_success; 102 bool& m_success;
103 }; 103 };
104 104
105 class Database::DatabaseCloseTask final : public DatabaseTask { 105 class Database::DatabaseCloseTask final : public DatabaseTask {
106 public: 106 public:
107 static std::unique_ptr<DatabaseCloseTask> create( 107 static std::unique_ptr<DatabaseCloseTask> create(
108 Database* db, 108 Database* db,
109 WaitableEvent* synchronizer) { 109 WaitableEvent* synchronizer) {
110 return wrapUnique(new DatabaseCloseTask(db, synchronizer)); 110 return WTF::wrapUnique(new DatabaseCloseTask(db, synchronizer));
111 } 111 }
112 112
113 private: 113 private:
114 DatabaseCloseTask(Database*, WaitableEvent*); 114 DatabaseCloseTask(Database*, WaitableEvent*);
115 115
116 void doPerformTask() override; 116 void doPerformTask() override;
117 #if DCHECK_IS_ON() 117 #if DCHECK_IS_ON()
118 const char* debugTaskName() const override; 118 const char* debugTaskName() const override;
119 #endif 119 #endif
120 }; 120 };
121 121
122 class Database::DatabaseTransactionTask final : public DatabaseTask { 122 class Database::DatabaseTransactionTask final : public DatabaseTask {
123 public: 123 public:
124 ~DatabaseTransactionTask() override; 124 ~DatabaseTransactionTask() override;
125 125
126 // Transaction task is never synchronous, so no 'synchronizer' parameter. 126 // Transaction task is never synchronous, so no 'synchronizer' parameter.
127 static std::unique_ptr<DatabaseTransactionTask> create( 127 static std::unique_ptr<DatabaseTransactionTask> create(
128 SQLTransactionBackend* transaction) { 128 SQLTransactionBackend* transaction) {
129 return wrapUnique(new DatabaseTransactionTask(transaction)); 129 return WTF::wrapUnique(new DatabaseTransactionTask(transaction));
130 } 130 }
131 131
132 SQLTransactionBackend* transaction() const { return m_transaction.get(); } 132 SQLTransactionBackend* transaction() const { return m_transaction.get(); }
133 133
134 private: 134 private:
135 explicit DatabaseTransactionTask(SQLTransactionBackend*); 135 explicit DatabaseTransactionTask(SQLTransactionBackend*);
136 136
137 void doPerformTask() override; 137 void doPerformTask() override;
138 void taskCancelled() override; 138 void taskCancelled() override;
139 #if DCHECK_IS_ON() 139 #if DCHECK_IS_ON()
140 const char* debugTaskName() const override; 140 const char* debugTaskName() const override;
141 #endif 141 #endif
142 142
143 CrossThreadPersistent<SQLTransactionBackend> m_transaction; 143 CrossThreadPersistent<SQLTransactionBackend> m_transaction;
144 }; 144 };
145 145
146 class Database::DatabaseTableNamesTask final : public DatabaseTask { 146 class Database::DatabaseTableNamesTask final : public DatabaseTask {
147 public: 147 public:
148 static std::unique_ptr<DatabaseTableNamesTask> 148 static std::unique_ptr<DatabaseTableNamesTask>
149 create(Database* db, WaitableEvent* synchronizer, Vector<String>& names) { 149 create(Database* db, WaitableEvent* synchronizer, Vector<String>& names) {
150 return wrapUnique(new DatabaseTableNamesTask(db, synchronizer, names)); 150 return WTF::wrapUnique(new DatabaseTableNamesTask(db, synchronizer, names));
151 } 151 }
152 152
153 private: 153 private:
154 DatabaseTableNamesTask(Database*, WaitableEvent*, Vector<String>& names); 154 DatabaseTableNamesTask(Database*, WaitableEvent*, Vector<String>& names);
155 155
156 void doPerformTask() override; 156 void doPerformTask() override;
157 #if DCHECK_IS_ON() 157 #if DCHECK_IS_ON()
158 const char* debugTaskName() const override; 158 const char* debugTaskName() const override;
159 #endif 159 #endif
160 160
161 Vector<String>& m_tableNames; 161 Vector<String>& m_tableNames;
162 }; 162 };
163 163
164 } // namespace blink 164 } // namespace blink
165 165
166 #endif // DatabaseTask_h 166 #endif // DatabaseTask_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698