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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved. 3 * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
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 23 matching lines...) Expand all
34 #include "modules/filesystem/DOMFileSystemBase.h" 34 #include "modules/filesystem/DOMFileSystemBase.h"
35 #include "modules/filesystem/DirectoryEntrySync.h" 35 #include "modules/filesystem/DirectoryEntrySync.h"
36 #include "modules/filesystem/ErrorCallback.h" 36 #include "modules/filesystem/ErrorCallback.h"
37 #include "modules/filesystem/FileEntrySync.h" 37 #include "modules/filesystem/FileEntrySync.h"
38 #include "modules/filesystem/FileSystemCallback.h" 38 #include "modules/filesystem/FileSystemCallback.h"
39 #include "modules/filesystem/FileSystemCallbacks.h" 39 #include "modules/filesystem/FileSystemCallbacks.h"
40 #include "modules/filesystem/LocalFileSystem.h" 40 #include "modules/filesystem/LocalFileSystem.h"
41 #include "modules/filesystem/SyncCallbackHelper.h" 41 #include "modules/filesystem/SyncCallbackHelper.h"
42 #include "platform/FileSystemType.h" 42 #include "platform/FileSystemType.h"
43 #include "platform/weborigin/SecurityOrigin.h" 43 #include "platform/weborigin/SecurityOrigin.h"
44 #include <memory>
44 45
45 namespace blink { 46 namespace blink {
46 47
47 void WorkerGlobalScopeFileSystem::webkitRequestFileSystem(WorkerGlobalScope& wor ker, int type, long long size, FileSystemCallback* successCallback, ErrorCallbac k* errorCallback) 48 void WorkerGlobalScopeFileSystem::webkitRequestFileSystem(WorkerGlobalScope& wor ker, int type, long long size, FileSystemCallback* successCallback, ErrorCallbac k* errorCallback)
48 { 49 {
49 ExecutionContext* secureContext = worker.getExecutionContext(); 50 ExecutionContext* secureContext = worker.getExecutionContext();
50 if (!secureContext->getSecurityOrigin()->canAccessFileSystem()) { 51 if (!secureContext->getSecurityOrigin()->canAccessFileSystem()) {
51 DOMFileSystem::scheduleCallback(&worker, errorCallback, FileError::creat e(FileError::SECURITY_ERR)); 52 DOMFileSystem::scheduleCallback(&worker, errorCallback, FileError::creat e(FileError::SECURITY_ERR));
52 return; 53 return;
53 } 54 }
(...skipping 15 matching lines...) Expand all
69 return 0; 70 return 0;
70 } 71 }
71 72
72 FileSystemType fileSystemType = static_cast<FileSystemType>(type); 73 FileSystemType fileSystemType = static_cast<FileSystemType>(type);
73 if (!DOMFileSystemBase::isValidType(fileSystemType)) { 74 if (!DOMFileSystemBase::isValidType(fileSystemType)) {
74 exceptionState.throwDOMException(InvalidModificationError, "the type mus t be TEMPORARY or PERSISTENT."); 75 exceptionState.throwDOMException(InvalidModificationError, "the type mus t be TEMPORARY or PERSISTENT.");
75 return 0; 76 return 0;
76 } 77 }
77 78
78 FileSystemSyncCallbackHelper* helper = FileSystemSyncCallbackHelper::create( ); 79 FileSystemSyncCallbackHelper* helper = FileSystemSyncCallbackHelper::create( );
79 OwnPtr<AsyncFileSystemCallbacks> callbacks = FileSystemCallbacks::create(hel per->getSuccessCallback(), helper->getErrorCallback(), &worker, fileSystemType); 80 std::unique_ptr<AsyncFileSystemCallbacks> callbacks = FileSystemCallbacks::c reate(helper->getSuccessCallback(), helper->getErrorCallback(), &worker, fileSys temType);
80 callbacks->setShouldBlockUntilCompletion(true); 81 callbacks->setShouldBlockUntilCompletion(true);
81 82
82 LocalFileSystem::from(worker)->requestFileSystem(&worker, fileSystemType, si ze, std::move(callbacks)); 83 LocalFileSystem::from(worker)->requestFileSystem(&worker, fileSystemType, si ze, std::move(callbacks));
83 return helper->getResult(exceptionState); 84 return helper->getResult(exceptionState);
84 } 85 }
85 86
86 void WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemURL(WorkerGlobalSc ope& worker, const String& url, EntryCallback* successCallback, ErrorCallback* e rrorCallback) 87 void WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemURL(WorkerGlobalSc ope& worker, const String& url, EntryCallback* successCallback, ErrorCallback* e rrorCallback)
87 { 88 {
88 KURL completedURL = worker.completeURL(url); 89 KURL completedURL = worker.completeURL(url);
89 ExecutionContext* secureContext = worker.getExecutionContext(); 90 ExecutionContext* secureContext = worker.getExecutionContext();
(...skipping 18 matching lines...) Expand all
108 exceptionState.throwSecurityError(FileError::securityErrorMessage); 109 exceptionState.throwSecurityError(FileError::securityErrorMessage);
109 return 0; 110 return 0;
110 } 111 }
111 112
112 if (!completedURL.isValid()) { 113 if (!completedURL.isValid()) {
113 exceptionState.throwDOMException(EncodingError, "the URL '" + url + "' i s invalid."); 114 exceptionState.throwDOMException(EncodingError, "the URL '" + url + "' i s invalid.");
114 return 0; 115 return 0;
115 } 116 }
116 117
117 EntrySyncCallbackHelper* resolveURLHelper = EntrySyncCallbackHelper::create( ); 118 EntrySyncCallbackHelper* resolveURLHelper = EntrySyncCallbackHelper::create( );
118 OwnPtr<AsyncFileSystemCallbacks> callbacks = ResolveURICallbacks::create(res olveURLHelper->getSuccessCallback(), resolveURLHelper->getErrorCallback(), &work er); 119 std::unique_ptr<AsyncFileSystemCallbacks> callbacks = ResolveURICallbacks::c reate(resolveURLHelper->getSuccessCallback(), resolveURLHelper->getErrorCallback (), &worker);
119 callbacks->setShouldBlockUntilCompletion(true); 120 callbacks->setShouldBlockUntilCompletion(true);
120 121
121 LocalFileSystem::from(worker)->resolveURL(&worker, completedURL, std::move(c allbacks)); 122 LocalFileSystem::from(worker)->resolveURL(&worker, completedURL, std::move(c allbacks));
122 123
123 return resolveURLHelper->getResult(exceptionState); 124 return resolveURLHelper->getResult(exceptionState);
124 } 125 }
125 126
126 static_assert(static_cast<int>(WorkerGlobalScopeFileSystem::TEMPORARY) == static _cast<int>(FileSystemTypeTemporary), "WorkerGlobalScopeFileSystem::TEMPORARY sho uld match FileSystemTypeTemporary"); 127 static_assert(static_cast<int>(WorkerGlobalScopeFileSystem::TEMPORARY) == static _cast<int>(FileSystemTypeTemporary), "WorkerGlobalScopeFileSystem::TEMPORARY sho uld match FileSystemTypeTemporary");
127 static_assert(static_cast<int>(WorkerGlobalScopeFileSystem::PERSISTENT) == stati c_cast<int>(FileSystemTypePersistent), "WorkerGlobalScopeFileSystem::PERSISTENT should match FileSystemTypePersistent"); 128 static_assert(static_cast<int>(WorkerGlobalScopeFileSystem::PERSISTENT) == stati c_cast<int>(FileSystemTypePersistent), "WorkerGlobalScopeFileSystem::PERSISTENT should match FileSystemTypePersistent");
128 129
129 } // namespace blink 130 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698