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

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

Issue 135653002: Update modules classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove change to web/ Created 6 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 | Annotate | Revision Log
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #ifndef NDEBUG 68 #ifndef NDEBUG
69 bool m_hasCheckedForTermination; 69 bool m_hasCheckedForTermination;
70 #endif 70 #endif
71 }; 71 };
72 72
73 class DatabaseTask : public blink::WebThread::Task { 73 class DatabaseTask : public blink::WebThread::Task {
74 WTF_MAKE_NONCOPYABLE(DatabaseTask); WTF_MAKE_FAST_ALLOCATED; 74 WTF_MAKE_NONCOPYABLE(DatabaseTask); WTF_MAKE_FAST_ALLOCATED;
75 public: 75 public:
76 virtual ~DatabaseTask(); 76 virtual ~DatabaseTask();
77 77
78 virtual void run() OVERRIDE; 78 virtual void run() OVERRIDE FINAL;
79 79
80 DatabaseBackend* database() const { return m_database.get(); } 80 DatabaseBackend* database() const { return m_database.get(); }
81 #ifndef NDEBUG 81 #ifndef NDEBUG
82 bool hasSynchronizer() const { return m_synchronizer; } 82 bool hasSynchronizer() const { return m_synchronizer; }
83 bool hasCheckedForTermination() const { return m_synchronizer->hasCheckedFor Termination(); } 83 bool hasCheckedForTermination() const { return m_synchronizer->hasCheckedFor Termination(); }
84 #endif 84 #endif
85 85
86 protected: 86 protected:
87 DatabaseTask(DatabaseBackend*, DatabaseTaskSynchronizer*); 87 DatabaseTask(DatabaseBackend*, DatabaseTaskSynchronizer*);
88 88
89 private: 89 private:
90 virtual void doPerformTask() = 0; 90 virtual void doPerformTask() = 0;
91 virtual void taskCancelled() { } 91 virtual void taskCancelled() { }
92 92
93 RefPtr<DatabaseBackend> m_database; 93 RefPtr<DatabaseBackend> m_database;
94 DatabaseTaskSynchronizer* m_synchronizer; 94 DatabaseTaskSynchronizer* m_synchronizer;
95 95
96 #if !LOG_DISABLED 96 #if !LOG_DISABLED
97 virtual const char* debugTaskName() const = 0; 97 virtual const char* debugTaskName() const = 0;
98 bool m_complete; 98 bool m_complete;
99 #endif 99 #endif
100 }; 100 };
101 101
102 class DatabaseBackend::DatabaseOpenTask : public DatabaseTask { 102 class DatabaseBackend::DatabaseOpenTask FINAL : public DatabaseTask {
103 public: 103 public:
104 static PassOwnPtr<DatabaseOpenTask> create(DatabaseBackend* db, bool setVers ionInNewDatabase, DatabaseTaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success) 104 static PassOwnPtr<DatabaseOpenTask> create(DatabaseBackend* db, bool setVers ionInNewDatabase, DatabaseTaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success)
105 { 105 {
106 return adoptPtr(new DatabaseOpenTask(db, setVersionInNewDatabase, synchr onizer, error, errorMessage, success)); 106 return adoptPtr(new DatabaseOpenTask(db, setVersionInNewDatabase, synchr onizer, error, errorMessage, success));
107 } 107 }
108 108
109 private: 109 private:
110 DatabaseOpenTask(DatabaseBackend*, bool setVersionInNewDatabase, DatabaseTas kSynchronizer*, DatabaseError&, String& errorMessage, bool& success); 110 DatabaseOpenTask(DatabaseBackend*, bool setVersionInNewDatabase, DatabaseTas kSynchronizer*, DatabaseError&, String& errorMessage, bool& success);
111 111
112 virtual void doPerformTask(); 112 virtual void doPerformTask() OVERRIDE;
113 #if !LOG_DISABLED 113 #if !LOG_DISABLED
114 virtual const char* debugTaskName() const; 114 virtual const char* debugTaskName() const OVERRIDE;
115 #endif 115 #endif
116 116
117 bool m_setVersionInNewDatabase; 117 bool m_setVersionInNewDatabase;
118 DatabaseError& m_error; 118 DatabaseError& m_error;
119 String& m_errorMessage; 119 String& m_errorMessage;
120 bool& m_success; 120 bool& m_success;
121 }; 121 };
122 122
123 class DatabaseBackend::DatabaseCloseTask : public DatabaseTask { 123 class DatabaseBackend::DatabaseCloseTask FINAL : public DatabaseTask {
124 public: 124 public:
125 static PassOwnPtr<DatabaseCloseTask> create(DatabaseBackend* db, DatabaseTas kSynchronizer* synchronizer) 125 static PassOwnPtr<DatabaseCloseTask> create(DatabaseBackend* db, DatabaseTas kSynchronizer* synchronizer)
126 { 126 {
127 return adoptPtr(new DatabaseCloseTask(db, synchronizer)); 127 return adoptPtr(new DatabaseCloseTask(db, synchronizer));
128 } 128 }
129 129
130 private: 130 private:
131 DatabaseCloseTask(DatabaseBackend*, DatabaseTaskSynchronizer*); 131 DatabaseCloseTask(DatabaseBackend*, DatabaseTaskSynchronizer*);
132 132
133 virtual void doPerformTask(); 133 virtual void doPerformTask() OVERRIDE;
134 #if !LOG_DISABLED 134 #if !LOG_DISABLED
135 virtual const char* debugTaskName() const; 135 virtual const char* debugTaskName() const OVERRIDE;
136 #endif 136 #endif
137 }; 137 };
138 138
139 class DatabaseBackend::DatabaseTransactionTask : public DatabaseTask { 139 class DatabaseBackend::DatabaseTransactionTask FINAL : public DatabaseTask {
140 public: 140 public:
141 virtual ~DatabaseTransactionTask(); 141 virtual ~DatabaseTransactionTask();
142 142
143 // Transaction task is never synchronous, so no 'synchronizer' parameter. 143 // Transaction task is never synchronous, so no 'synchronizer' parameter.
144 static PassOwnPtr<DatabaseTransactionTask> create(PassRefPtr<SQLTransactionB ackend> transaction) 144 static PassOwnPtr<DatabaseTransactionTask> create(PassRefPtr<SQLTransactionB ackend> transaction)
145 { 145 {
146 return adoptPtr(new DatabaseTransactionTask(transaction)); 146 return adoptPtr(new DatabaseTransactionTask(transaction));
147 } 147 }
148 148
149 SQLTransactionBackend* transaction() const { return m_transaction.get(); } 149 SQLTransactionBackend* transaction() const { return m_transaction.get(); }
150 150
151 private: 151 private:
152 explicit DatabaseTransactionTask(PassRefPtr<SQLTransactionBackend>); 152 explicit DatabaseTransactionTask(PassRefPtr<SQLTransactionBackend>);
153 153
154 virtual void doPerformTask(); 154 virtual void doPerformTask() OVERRIDE;
155 virtual void taskCancelled(); 155 virtual void taskCancelled() OVERRIDE;
156 #if !LOG_DISABLED 156 #if !LOG_DISABLED
157 virtual const char* debugTaskName() const; 157 virtual const char* debugTaskName() const OVERRIDE;
158 #endif 158 #endif
159 159
160 RefPtr<SQLTransactionBackend> m_transaction; 160 RefPtr<SQLTransactionBackend> m_transaction;
161 }; 161 };
162 162
163 class DatabaseBackend::DatabaseTableNamesTask : public DatabaseTask { 163 class DatabaseBackend::DatabaseTableNamesTask FINAL : public DatabaseTask {
164 public: 164 public:
165 static PassOwnPtr<DatabaseTableNamesTask> create(DatabaseBackend* db, Databa seTaskSynchronizer* synchronizer, Vector<String>& names) 165 static PassOwnPtr<DatabaseTableNamesTask> create(DatabaseBackend* db, Databa seTaskSynchronizer* synchronizer, Vector<String>& names)
166 { 166 {
167 return adoptPtr(new DatabaseTableNamesTask(db, synchronizer, names)); 167 return adoptPtr(new DatabaseTableNamesTask(db, synchronizer, names));
168 } 168 }
169 169
170 private: 170 private:
171 DatabaseTableNamesTask(DatabaseBackend*, DatabaseTaskSynchronizer*, Vector<S tring>& names); 171 DatabaseTableNamesTask(DatabaseBackend*, DatabaseTaskSynchronizer*, Vector<S tring>& names);
172 172
173 virtual void doPerformTask(); 173 virtual void doPerformTask() OVERRIDE;
174 #if !LOG_DISABLED 174 #if !LOG_DISABLED
175 virtual const char* debugTaskName() const; 175 virtual const char* debugTaskName() const OVERRIDE;
176 #endif 176 #endif
177 177
178 Vector<String>& m_tableNames; 178 Vector<String>& m_tableNames;
179 }; 179 };
180 180
181 } // namespace WebCore 181 } // namespace WebCore
182 182
183 #endif // DatabaseTask_h 183 #endif // DatabaseTask_h
OLDNEW
« no previous file with comments | « Source/modules/webdatabase/DatabaseSync.h ('k') | Source/modules/webdatabase/DatabaseTracker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698