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

Side by Side Diff: third_party/WebKit/Source/modules/filesystem/DOMFileSystem.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) 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 28 matching lines...) Expand all
39 #include "modules/filesystem/FileWriter.h" 39 #include "modules/filesystem/FileWriter.h"
40 #include "modules/filesystem/FileWriterBaseCallback.h" 40 #include "modules/filesystem/FileWriterBaseCallback.h"
41 #include "modules/filesystem/FileWriterCallback.h" 41 #include "modules/filesystem/FileWriterCallback.h"
42 #include "modules/filesystem/MetadataCallback.h" 42 #include "modules/filesystem/MetadataCallback.h"
43 #include "platform/FileMetadata.h" 43 #include "platform/FileMetadata.h"
44 #include "platform/weborigin/SecurityOrigin.h" 44 #include "platform/weborigin/SecurityOrigin.h"
45 #include "public/platform/Platform.h" 45 #include "public/platform/Platform.h"
46 #include "public/platform/WebFileSystem.h" 46 #include "public/platform/WebFileSystem.h"
47 #include "public/platform/WebFileSystemCallbacks.h" 47 #include "public/platform/WebFileSystemCallbacks.h"
48 #include "public/platform/WebSecurityOrigin.h" 48 #include "public/platform/WebSecurityOrigin.h"
49 #include "wtf/OwnPtr.h"
50 #include "wtf/text/StringBuilder.h" 49 #include "wtf/text/StringBuilder.h"
51 #include "wtf/text/WTFString.h" 50 #include "wtf/text/WTFString.h"
51 #include <memory>
52 52
53 namespace blink { 53 namespace blink {
54 54
55 // static 55 // static
56 DOMFileSystem* DOMFileSystem::create(ExecutionContext* context, const String& na me, FileSystemType type, const KURL& rootURL) 56 DOMFileSystem* DOMFileSystem::create(ExecutionContext* context, const String& na me, FileSystemType type, const KURL& rootURL)
57 { 57 {
58 DOMFileSystem* fileSystem(new DOMFileSystem(context, name, type, rootURL)); 58 DOMFileSystem* fileSystem(new DOMFileSystem(context, name, type, rootURL));
59 fileSystem->suspendIfNeeded(); 59 fileSystem->suspendIfNeeded();
60 return fileSystem; 60 return fileSystem;
61 } 61 }
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 { 153 {
154 ASSERT(fileEntry); 154 ASSERT(fileEntry);
155 155
156 if (!fileSystem()) { 156 if (!fileSystem()) {
157 reportError(errorCallback, FileError::create(FileError::ABORT_ERR)); 157 reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
158 return; 158 return;
159 } 159 }
160 160
161 FileWriter* fileWriter = FileWriter::create(getExecutionContext()); 161 FileWriter* fileWriter = FileWriter::create(getExecutionContext());
162 FileWriterBaseCallback* conversionCallback = ConvertToFileWriterCallback::cr eate(successCallback); 162 FileWriterBaseCallback* conversionCallback = ConvertToFileWriterCallback::cr eate(successCallback);
163 OwnPtr<AsyncFileSystemCallbacks> callbacks = FileWriterBaseCallbacks::create (fileWriter, conversionCallback, errorCallback, m_context); 163 std::unique_ptr<AsyncFileSystemCallbacks> callbacks = FileWriterBaseCallback s::create(fileWriter, conversionCallback, errorCallback, m_context);
164 fileSystem()->createFileWriter(createFileSystemURL(fileEntry), fileWriter, s td::move(callbacks)); 164 fileSystem()->createFileWriter(createFileSystemURL(fileEntry), fileWriter, s td::move(callbacks));
165 } 165 }
166 166
167 void DOMFileSystem::createFile(const FileEntry* fileEntry, BlobCallback* success Callback, ErrorCallback* errorCallback) 167 void DOMFileSystem::createFile(const FileEntry* fileEntry, BlobCallback* success Callback, ErrorCallback* errorCallback)
168 { 168 {
169 KURL fileSystemURL = createFileSystemURL(fileEntry); 169 KURL fileSystemURL = createFileSystemURL(fileEntry);
170 if (!fileSystem()) { 170 if (!fileSystem()) {
171 reportError(errorCallback, FileError::create(FileError::ABORT_ERR)); 171 reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
172 return; 172 return;
173 } 173 }
174 174
175 fileSystem()->createSnapshotFileAndReadMetadata(fileSystemURL, SnapshotFileC allback::create(this, fileEntry->name(), fileSystemURL, successCallback, errorCa llback, m_context)); 175 fileSystem()->createSnapshotFileAndReadMetadata(fileSystemURL, SnapshotFileC allback::create(this, fileEntry->name(), fileSystemURL, successCallback, errorCa llback, m_context));
176 } 176 }
177 177
178 DEFINE_TRACE(DOMFileSystem) 178 DEFINE_TRACE(DOMFileSystem)
179 { 179 {
180 DOMFileSystemBase::trace(visitor); 180 DOMFileSystemBase::trace(visitor);
181 ActiveDOMObject::trace(visitor); 181 ActiveDOMObject::trace(visitor);
182 visitor->trace(m_rootEntry); 182 visitor->trace(m_rootEntry);
183 } 183 }
184 184
185 } // namespace blink 185 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698