OLD | NEW |
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "wtf/Vector.h" | 42 #include "wtf/Vector.h" |
43 #include "wtf/text/WTFString.h" | 43 #include "wtf/text/WTFString.h" |
44 | 44 |
45 namespace blink { | 45 namespace blink { |
46 | 46 |
47 class DatabaseTask : public WebThread::Task { | 47 class DatabaseTask : public WebThread::Task { |
48 WTF_MAKE_NONCOPYABLE(DatabaseTask); WTF_MAKE_FAST_ALLOCATED; | 48 WTF_MAKE_NONCOPYABLE(DatabaseTask); WTF_MAKE_FAST_ALLOCATED; |
49 public: | 49 public: |
50 virtual ~DatabaseTask(); | 50 virtual ~DatabaseTask(); |
51 | 51 |
52 virtual void run() OVERRIDE FINAL; | 52 virtual void run() override final; |
53 | 53 |
54 Database* database() const { return m_database.get(); } | 54 Database* database() const { return m_database.get(); } |
55 #if ENABLE(ASSERT) | 55 #if ENABLE(ASSERT) |
56 bool hasSynchronizer() const { return m_synchronizer; } | 56 bool hasSynchronizer() const { return m_synchronizer; } |
57 #endif | 57 #endif |
58 | 58 |
59 protected: | 59 protected: |
60 DatabaseTask(Database*, TaskSynchronizer*); | 60 DatabaseTask(Database*, TaskSynchronizer*); |
61 | 61 |
62 private: | 62 private: |
63 virtual void doPerformTask() = 0; | 63 virtual void doPerformTask() = 0; |
64 virtual void taskCancelled() { } | 64 virtual void taskCancelled() { } |
65 | 65 |
66 CrossThreadPersistent<Database> m_database; | 66 CrossThreadPersistent<Database> m_database; |
67 TaskSynchronizer* m_synchronizer; | 67 TaskSynchronizer* m_synchronizer; |
68 | 68 |
69 #if !LOG_DISABLED | 69 #if !LOG_DISABLED |
70 virtual const char* debugTaskName() const = 0; | 70 virtual const char* debugTaskName() const = 0; |
71 bool m_complete; | 71 bool m_complete; |
72 #endif | 72 #endif |
73 }; | 73 }; |
74 | 74 |
75 class Database::DatabaseOpenTask FINAL : public DatabaseTask { | 75 class Database::DatabaseOpenTask final : public DatabaseTask { |
76 public: | 76 public: |
77 static PassOwnPtr<DatabaseOpenTask> create(Database* db, bool setVersionInNe
wDatabase, TaskSynchronizer* synchronizer, DatabaseError& error, String& errorMe
ssage, bool& success) | 77 static PassOwnPtr<DatabaseOpenTask> create(Database* db, bool setVersionInNe
wDatabase, TaskSynchronizer* synchronizer, DatabaseError& error, String& errorMe
ssage, bool& success) |
78 { | 78 { |
79 return adoptPtr(new DatabaseOpenTask(db, setVersionInNewDatabase, synchr
onizer, error, errorMessage, success)); | 79 return adoptPtr(new DatabaseOpenTask(db, setVersionInNewDatabase, synchr
onizer, error, errorMessage, success)); |
80 } | 80 } |
81 | 81 |
82 private: | 82 private: |
83 DatabaseOpenTask(Database*, bool setVersionInNewDatabase, TaskSynchronizer*,
DatabaseError&, String& errorMessage, bool& success); | 83 DatabaseOpenTask(Database*, bool setVersionInNewDatabase, TaskSynchronizer*,
DatabaseError&, String& errorMessage, bool& success); |
84 | 84 |
85 virtual void doPerformTask() OVERRIDE; | 85 virtual void doPerformTask() override; |
86 #if !LOG_DISABLED | 86 #if !LOG_DISABLED |
87 virtual const char* debugTaskName() const OVERRIDE; | 87 virtual const char* debugTaskName() const override; |
88 #endif | 88 #endif |
89 | 89 |
90 bool m_setVersionInNewDatabase; | 90 bool m_setVersionInNewDatabase; |
91 DatabaseError& m_error; | 91 DatabaseError& m_error; |
92 String& m_errorMessage; | 92 String& m_errorMessage; |
93 bool& m_success; | 93 bool& m_success; |
94 }; | 94 }; |
95 | 95 |
96 class Database::DatabaseCloseTask FINAL : public DatabaseTask { | 96 class Database::DatabaseCloseTask final : public DatabaseTask { |
97 public: | 97 public: |
98 static PassOwnPtr<DatabaseCloseTask> create(Database* db, TaskSynchronizer*
synchronizer) | 98 static PassOwnPtr<DatabaseCloseTask> create(Database* db, TaskSynchronizer*
synchronizer) |
99 { | 99 { |
100 return adoptPtr(new DatabaseCloseTask(db, synchronizer)); | 100 return adoptPtr(new DatabaseCloseTask(db, synchronizer)); |
101 } | 101 } |
102 | 102 |
103 private: | 103 private: |
104 DatabaseCloseTask(Database*, TaskSynchronizer*); | 104 DatabaseCloseTask(Database*, TaskSynchronizer*); |
105 | 105 |
106 virtual void doPerformTask() OVERRIDE; | 106 virtual void doPerformTask() override; |
107 #if !LOG_DISABLED | 107 #if !LOG_DISABLED |
108 virtual const char* debugTaskName() const OVERRIDE; | 108 virtual const char* debugTaskName() const override; |
109 #endif | 109 #endif |
110 }; | 110 }; |
111 | 111 |
112 class Database::DatabaseTransactionTask FINAL : public DatabaseTask { | 112 class Database::DatabaseTransactionTask final : public DatabaseTask { |
113 public: | 113 public: |
114 virtual ~DatabaseTransactionTask(); | 114 virtual ~DatabaseTransactionTask(); |
115 | 115 |
116 // Transaction task is never synchronous, so no 'synchronizer' parameter. | 116 // Transaction task is never synchronous, so no 'synchronizer' parameter. |
117 static PassOwnPtr<DatabaseTransactionTask> create(SQLTransactionBackend* tra
nsaction) | 117 static PassOwnPtr<DatabaseTransactionTask> create(SQLTransactionBackend* tra
nsaction) |
118 { | 118 { |
119 return adoptPtr(new DatabaseTransactionTask(transaction)); | 119 return adoptPtr(new DatabaseTransactionTask(transaction)); |
120 } | 120 } |
121 | 121 |
122 SQLTransactionBackend* transaction() const { return m_transaction.get(); } | 122 SQLTransactionBackend* transaction() const { return m_transaction.get(); } |
123 | 123 |
124 private: | 124 private: |
125 explicit DatabaseTransactionTask(SQLTransactionBackend*); | 125 explicit DatabaseTransactionTask(SQLTransactionBackend*); |
126 | 126 |
127 virtual void doPerformTask() OVERRIDE; | 127 virtual void doPerformTask() override; |
128 virtual void taskCancelled() OVERRIDE; | 128 virtual void taskCancelled() override; |
129 #if !LOG_DISABLED | 129 #if !LOG_DISABLED |
130 virtual const char* debugTaskName() const OVERRIDE; | 130 virtual const char* debugTaskName() const override; |
131 #endif | 131 #endif |
132 | 132 |
133 CrossThreadPersistent<SQLTransactionBackend> m_transaction; | 133 CrossThreadPersistent<SQLTransactionBackend> m_transaction; |
134 }; | 134 }; |
135 | 135 |
136 class Database::DatabaseTableNamesTask FINAL : public DatabaseTask { | 136 class Database::DatabaseTableNamesTask final : public DatabaseTask { |
137 public: | 137 public: |
138 static PassOwnPtr<DatabaseTableNamesTask> create(Database* db, TaskSynchroni
zer* synchronizer, Vector<String>& names) | 138 static PassOwnPtr<DatabaseTableNamesTask> create(Database* db, TaskSynchroni
zer* synchronizer, Vector<String>& names) |
139 { | 139 { |
140 return adoptPtr(new DatabaseTableNamesTask(db, synchronizer, names)); | 140 return adoptPtr(new DatabaseTableNamesTask(db, synchronizer, names)); |
141 } | 141 } |
142 | 142 |
143 private: | 143 private: |
144 DatabaseTableNamesTask(Database*, TaskSynchronizer*, Vector<String>& names); | 144 DatabaseTableNamesTask(Database*, TaskSynchronizer*, Vector<String>& names); |
145 | 145 |
146 virtual void doPerformTask() OVERRIDE; | 146 virtual void doPerformTask() override; |
147 #if !LOG_DISABLED | 147 #if !LOG_DISABLED |
148 virtual const char* debugTaskName() const OVERRIDE; | 148 virtual const char* debugTaskName() const override; |
149 #endif | 149 #endif |
150 | 150 |
151 Vector<String>& m_tableNames; | 151 Vector<String>& m_tableNames; |
152 }; | 152 }; |
153 | 153 |
154 } // namespace blink | 154 } // namespace blink |
155 | 155 |
156 #endif // DatabaseTask_h | 156 #endif // DatabaseTask_h |
OLD | NEW |