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

Side by Side Diff: third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp

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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 154
155 // EntryCallbacks ------------------------------------------------------------- 155 // EntryCallbacks -------------------------------------------------------------
156 156
157 std::unique_ptr<AsyncFileSystemCallbacks> EntryCallbacks::create( 157 std::unique_ptr<AsyncFileSystemCallbacks> EntryCallbacks::create(
158 EntryCallback* successCallback, 158 EntryCallback* successCallback,
159 ErrorCallbackBase* errorCallback, 159 ErrorCallbackBase* errorCallback,
160 ExecutionContext* context, 160 ExecutionContext* context,
161 DOMFileSystemBase* fileSystem, 161 DOMFileSystemBase* fileSystem,
162 const String& expectedPath, 162 const String& expectedPath,
163 bool isDirectory) { 163 bool isDirectory) {
164 return wrapUnique(new EntryCallbacks(successCallback, errorCallback, context, 164 return WTF::wrapUnique(new EntryCallbacks(successCallback, errorCallback,
165 fileSystem, expectedPath, isDirectory)); 165 context, fileSystem, expectedPath,
166 isDirectory));
166 } 167 }
167 168
168 EntryCallbacks::EntryCallbacks(EntryCallback* successCallback, 169 EntryCallbacks::EntryCallbacks(EntryCallback* successCallback,
169 ErrorCallbackBase* errorCallback, 170 ErrorCallbackBase* errorCallback,
170 ExecutionContext* context, 171 ExecutionContext* context,
171 DOMFileSystemBase* fileSystem, 172 DOMFileSystemBase* fileSystem,
172 const String& expectedPath, 173 const String& expectedPath,
173 bool isDirectory) 174 bool isDirectory)
174 : FileSystemCallbacksBase(errorCallback, fileSystem, context), 175 : FileSystemCallbacksBase(errorCallback, fileSystem, context),
175 m_successCallback(successCallback), 176 m_successCallback(successCallback),
(...skipping 14 matching lines...) Expand all
190 } 191 }
191 192
192 // EntriesCallbacks ----------------------------------------------------------- 193 // EntriesCallbacks -----------------------------------------------------------
193 194
194 std::unique_ptr<AsyncFileSystemCallbacks> EntriesCallbacks::create( 195 std::unique_ptr<AsyncFileSystemCallbacks> EntriesCallbacks::create(
195 EntriesCallback* successCallback, 196 EntriesCallback* successCallback,
196 ErrorCallbackBase* errorCallback, 197 ErrorCallbackBase* errorCallback,
197 ExecutionContext* context, 198 ExecutionContext* context,
198 DirectoryReaderBase* directoryReader, 199 DirectoryReaderBase* directoryReader,
199 const String& basePath) { 200 const String& basePath) {
200 return wrapUnique(new EntriesCallbacks(successCallback, errorCallback, 201 return WTF::wrapUnique(new EntriesCallbacks(
201 context, directoryReader, basePath)); 202 successCallback, errorCallback, context, directoryReader, basePath));
202 } 203 }
203 204
204 EntriesCallbacks::EntriesCallbacks(EntriesCallback* successCallback, 205 EntriesCallbacks::EntriesCallbacks(EntriesCallback* successCallback,
205 ErrorCallbackBase* errorCallback, 206 ErrorCallbackBase* errorCallback,
206 ExecutionContext* context, 207 ExecutionContext* context,
207 DirectoryReaderBase* directoryReader, 208 DirectoryReaderBase* directoryReader,
208 const String& basePath) 209 const String& basePath)
209 : FileSystemCallbacksBase(errorCallback, 210 : FileSystemCallbacksBase(errorCallback,
210 directoryReader->filesystem(), 211 directoryReader->filesystem(),
211 context), 212 context),
(...skipping 23 matching lines...) Expand all
235 m_successCallback->handleEvent(entries); 236 m_successCallback->handleEvent(entries);
236 } 237 }
237 238
238 // FileSystemCallbacks -------------------------------------------------------- 239 // FileSystemCallbacks --------------------------------------------------------
239 240
240 std::unique_ptr<AsyncFileSystemCallbacks> FileSystemCallbacks::create( 241 std::unique_ptr<AsyncFileSystemCallbacks> FileSystemCallbacks::create(
241 FileSystemCallback* successCallback, 242 FileSystemCallback* successCallback,
242 ErrorCallbackBase* errorCallback, 243 ErrorCallbackBase* errorCallback,
243 ExecutionContext* context, 244 ExecutionContext* context,
244 FileSystemType type) { 245 FileSystemType type) {
245 return wrapUnique( 246 return WTF::wrapUnique(
246 new FileSystemCallbacks(successCallback, errorCallback, context, type)); 247 new FileSystemCallbacks(successCallback, errorCallback, context, type));
247 } 248 }
248 249
249 FileSystemCallbacks::FileSystemCallbacks(FileSystemCallback* successCallback, 250 FileSystemCallbacks::FileSystemCallbacks(FileSystemCallback* successCallback,
250 ErrorCallbackBase* errorCallback, 251 ErrorCallbackBase* errorCallback,
251 ExecutionContext* context, 252 ExecutionContext* context,
252 FileSystemType type) 253 FileSystemType type)
253 : FileSystemCallbacksBase(errorCallback, nullptr, context), 254 : FileSystemCallbacksBase(errorCallback, nullptr, context),
254 m_successCallback(successCallback), 255 m_successCallback(successCallback),
255 m_type(type) {} 256 m_type(type) {}
256 257
257 void FileSystemCallbacks::didOpenFileSystem(const String& name, 258 void FileSystemCallbacks::didOpenFileSystem(const String& name,
258 const KURL& rootURL) { 259 const KURL& rootURL) {
259 if (m_successCallback) 260 if (m_successCallback)
260 handleEventOrScheduleCallback( 261 handleEventOrScheduleCallback(
261 m_successCallback.release(), 262 m_successCallback.release(),
262 DOMFileSystem::create(m_executionContext.get(), name, m_type, rootURL)); 263 DOMFileSystem::create(m_executionContext.get(), name, m_type, rootURL));
263 } 264 }
264 265
265 // ResolveURICallbacks -------------------------------------------------------- 266 // ResolveURICallbacks --------------------------------------------------------
266 267
267 std::unique_ptr<AsyncFileSystemCallbacks> ResolveURICallbacks::create( 268 std::unique_ptr<AsyncFileSystemCallbacks> ResolveURICallbacks::create(
268 EntryCallback* successCallback, 269 EntryCallback* successCallback,
269 ErrorCallbackBase* errorCallback, 270 ErrorCallbackBase* errorCallback,
270 ExecutionContext* context) { 271 ExecutionContext* context) {
271 return wrapUnique( 272 return WTF::wrapUnique(
272 new ResolveURICallbacks(successCallback, errorCallback, context)); 273 new ResolveURICallbacks(successCallback, errorCallback, context));
273 } 274 }
274 275
275 ResolveURICallbacks::ResolveURICallbacks(EntryCallback* successCallback, 276 ResolveURICallbacks::ResolveURICallbacks(EntryCallback* successCallback,
276 ErrorCallbackBase* errorCallback, 277 ErrorCallbackBase* errorCallback,
277 ExecutionContext* context) 278 ExecutionContext* context)
278 : FileSystemCallbacksBase(errorCallback, nullptr, context), 279 : FileSystemCallbacksBase(errorCallback, nullptr, context),
279 m_successCallback(successCallback) {} 280 m_successCallback(successCallback) {}
280 281
281 void ResolveURICallbacks::didResolveURL(const String& name, 282 void ResolveURICallbacks::didResolveURL(const String& name,
(...skipping 22 matching lines...) Expand all
304 FileEntry::create(filesystem, absolutePath)); 305 FileEntry::create(filesystem, absolutePath));
305 } 306 }
306 307
307 // MetadataCallbacks ---------------------------------------------------------- 308 // MetadataCallbacks ----------------------------------------------------------
308 309
309 std::unique_ptr<AsyncFileSystemCallbacks> MetadataCallbacks::create( 310 std::unique_ptr<AsyncFileSystemCallbacks> MetadataCallbacks::create(
310 MetadataCallback* successCallback, 311 MetadataCallback* successCallback,
311 ErrorCallbackBase* errorCallback, 312 ErrorCallbackBase* errorCallback,
312 ExecutionContext* context, 313 ExecutionContext* context,
313 DOMFileSystemBase* fileSystem) { 314 DOMFileSystemBase* fileSystem) {
314 return wrapUnique(new MetadataCallbacks(successCallback, errorCallback, 315 return WTF::wrapUnique(new MetadataCallbacks(successCallback, errorCallback,
315 context, fileSystem)); 316 context, fileSystem));
316 } 317 }
317 318
318 MetadataCallbacks::MetadataCallbacks(MetadataCallback* successCallback, 319 MetadataCallbacks::MetadataCallbacks(MetadataCallback* successCallback,
319 ErrorCallbackBase* errorCallback, 320 ErrorCallbackBase* errorCallback,
320 ExecutionContext* context, 321 ExecutionContext* context,
321 DOMFileSystemBase* fileSystem) 322 DOMFileSystemBase* fileSystem)
322 : FileSystemCallbacksBase(errorCallback, fileSystem, context), 323 : FileSystemCallbacksBase(errorCallback, fileSystem, context),
323 m_successCallback(successCallback) {} 324 m_successCallback(successCallback) {}
324 325
325 void MetadataCallbacks::didReadMetadata(const FileMetadata& metadata) { 326 void MetadataCallbacks::didReadMetadata(const FileMetadata& metadata) {
326 if (m_successCallback) 327 if (m_successCallback)
327 handleEventOrScheduleCallback(m_successCallback.release(), 328 handleEventOrScheduleCallback(m_successCallback.release(),
328 Metadata::create(metadata)); 329 Metadata::create(metadata));
329 } 330 }
330 331
331 // FileWriterBaseCallbacks ---------------------------------------------------- 332 // FileWriterBaseCallbacks ----------------------------------------------------
332 333
333 std::unique_ptr<AsyncFileSystemCallbacks> FileWriterBaseCallbacks::create( 334 std::unique_ptr<AsyncFileSystemCallbacks> FileWriterBaseCallbacks::create(
334 FileWriterBase* fileWriter, 335 FileWriterBase* fileWriter,
335 FileWriterBaseCallback* successCallback, 336 FileWriterBaseCallback* successCallback,
336 ErrorCallbackBase* errorCallback, 337 ErrorCallbackBase* errorCallback,
337 ExecutionContext* context) { 338 ExecutionContext* context) {
338 return wrapUnique(new FileWriterBaseCallbacks(fileWriter, successCallback, 339 return WTF::wrapUnique(new FileWriterBaseCallbacks(
339 errorCallback, context)); 340 fileWriter, successCallback, errorCallback, context));
340 } 341 }
341 342
342 FileWriterBaseCallbacks::FileWriterBaseCallbacks( 343 FileWriterBaseCallbacks::FileWriterBaseCallbacks(
343 FileWriterBase* fileWriter, 344 FileWriterBase* fileWriter,
344 FileWriterBaseCallback* successCallback, 345 FileWriterBaseCallback* successCallback,
345 ErrorCallbackBase* errorCallback, 346 ErrorCallbackBase* errorCallback,
346 ExecutionContext* context) 347 ExecutionContext* context)
347 : FileSystemCallbacksBase(errorCallback, nullptr, context), 348 : FileSystemCallbacksBase(errorCallback, nullptr, context),
348 m_fileWriter(fileWriter), 349 m_fileWriter(fileWriter),
349 m_successCallback(successCallback) {} 350 m_successCallback(successCallback) {}
350 351
351 void FileWriterBaseCallbacks::didCreateFileWriter( 352 void FileWriterBaseCallbacks::didCreateFileWriter(
352 std::unique_ptr<WebFileWriter> fileWriter, 353 std::unique_ptr<WebFileWriter> fileWriter,
353 long long length) { 354 long long length) {
354 m_fileWriter->initialize(std::move(fileWriter), length); 355 m_fileWriter->initialize(std::move(fileWriter), length);
355 if (m_successCallback) 356 if (m_successCallback)
356 handleEventOrScheduleCallback(m_successCallback.release(), 357 handleEventOrScheduleCallback(m_successCallback.release(),
357 m_fileWriter.release()); 358 m_fileWriter.release());
358 } 359 }
359 360
360 // SnapshotFileCallback ------------------------------------------------------- 361 // SnapshotFileCallback -------------------------------------------------------
361 362
362 std::unique_ptr<AsyncFileSystemCallbacks> SnapshotFileCallback::create( 363 std::unique_ptr<AsyncFileSystemCallbacks> SnapshotFileCallback::create(
363 DOMFileSystemBase* filesystem, 364 DOMFileSystemBase* filesystem,
364 const String& name, 365 const String& name,
365 const KURL& url, 366 const KURL& url,
366 BlobCallback* successCallback, 367 BlobCallback* successCallback,
367 ErrorCallbackBase* errorCallback, 368 ErrorCallbackBase* errorCallback,
368 ExecutionContext* context) { 369 ExecutionContext* context) {
369 return wrapUnique(new SnapshotFileCallback( 370 return WTF::wrapUnique(new SnapshotFileCallback(
370 filesystem, name, url, successCallback, errorCallback, context)); 371 filesystem, name, url, successCallback, errorCallback, context));
371 } 372 }
372 373
373 SnapshotFileCallback::SnapshotFileCallback(DOMFileSystemBase* filesystem, 374 SnapshotFileCallback::SnapshotFileCallback(DOMFileSystemBase* filesystem,
374 const String& name, 375 const String& name,
375 const KURL& url, 376 const KURL& url,
376 BlobCallback* successCallback, 377 BlobCallback* successCallback,
377 ErrorCallbackBase* errorCallback, 378 ErrorCallbackBase* errorCallback,
378 ExecutionContext* context) 379 ExecutionContext* context)
379 : FileSystemCallbacksBase(errorCallback, filesystem, context), 380 : FileSystemCallbacksBase(errorCallback, filesystem, context),
(...skipping 20 matching lines...) Expand all
400 m_name)); 401 m_name));
401 } 402 }
402 403
403 // VoidCallbacks -------------------------------------------------------------- 404 // VoidCallbacks --------------------------------------------------------------
404 405
405 std::unique_ptr<AsyncFileSystemCallbacks> VoidCallbacks::create( 406 std::unique_ptr<AsyncFileSystemCallbacks> VoidCallbacks::create(
406 VoidCallback* successCallback, 407 VoidCallback* successCallback,
407 ErrorCallbackBase* errorCallback, 408 ErrorCallbackBase* errorCallback,
408 ExecutionContext* context, 409 ExecutionContext* context,
409 DOMFileSystemBase* fileSystem) { 410 DOMFileSystemBase* fileSystem) {
410 return wrapUnique( 411 return WTF::wrapUnique(
411 new VoidCallbacks(successCallback, errorCallback, context, fileSystem)); 412 new VoidCallbacks(successCallback, errorCallback, context, fileSystem));
412 } 413 }
413 414
414 VoidCallbacks::VoidCallbacks(VoidCallback* successCallback, 415 VoidCallbacks::VoidCallbacks(VoidCallback* successCallback,
415 ErrorCallbackBase* errorCallback, 416 ErrorCallbackBase* errorCallback,
416 ExecutionContext* context, 417 ExecutionContext* context,
417 DOMFileSystemBase* fileSystem) 418 DOMFileSystemBase* fileSystem)
418 : FileSystemCallbacksBase(errorCallback, fileSystem, context), 419 : FileSystemCallbacksBase(errorCallback, fileSystem, context),
419 m_successCallback(successCallback) {} 420 m_successCallback(successCallback) {}
420 421
421 void VoidCallbacks::didSucceed() { 422 void VoidCallbacks::didSucceed() {
422 if (m_successCallback) 423 if (m_successCallback)
423 handleEventOrScheduleCallback(m_successCallback.release()); 424 handleEventOrScheduleCallback(m_successCallback.release());
424 } 425 }
425 426
426 } // namespace blink 427 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698