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

Side by Side Diff: content/browser/loader/temporary_file_stream.cc

Issue 1000373002: favor DCHECK_CURRENTLY_ON for better logs in content/browser/[f-p]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 5 years, 9 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/loader/temporary_file_stream.h" 5 #include "content/browser/loader/temporary_file_stream.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/files/file_proxy.h" 9 #include "base/files/file_proxy.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
12 #include "net/base/file_stream.h" 12 #include "net/base/file_stream.h"
13 #include "storage/browser/blob/shareable_file_reference.h" 13 #include "storage/browser/blob/shareable_file_reference.h"
14 14
15 using storage::ShareableFileReference; 15 using storage::ShareableFileReference;
16 16
17 namespace content { 17 namespace content {
18 18
19 namespace { 19 namespace {
20 20
21 void DidCreateTemporaryFile( 21 void DidCreateTemporaryFile(
22 const CreateTemporaryFileStreamCallback& callback, 22 const CreateTemporaryFileStreamCallback& callback,
23 scoped_ptr<base::FileProxy> file_proxy, 23 scoped_ptr<base::FileProxy> file_proxy,
24 base::File::Error error_code, 24 base::File::Error error_code,
25 const base::FilePath& file_path) { 25 const base::FilePath& file_path) {
26 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 26 DCHECK_CURRENTLY_ON(BrowserThread::IO);
27 27
28 if (!file_proxy->IsValid()) { 28 if (!file_proxy->IsValid()) {
29 callback.Run(error_code, scoped_ptr<net::FileStream>(), NULL); 29 callback.Run(error_code, scoped_ptr<net::FileStream>(), NULL);
30 return; 30 return;
31 } 31 }
32 32
33 scoped_refptr<base::TaskRunner> task_runner = 33 scoped_refptr<base::TaskRunner> task_runner =
34 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE); 34 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE);
35 35
36 // Cancelled or not, create the deletable_file so the temporary is cleaned up. 36 // Cancelled or not, create the deletable_file so the temporary is cleaned up.
37 scoped_refptr<ShareableFileReference> deletable_file = 37 scoped_refptr<ShareableFileReference> deletable_file =
38 ShareableFileReference::GetOrCreate( 38 ShareableFileReference::GetOrCreate(
39 file_path, 39 file_path,
40 ShareableFileReference::DELETE_ON_FINAL_RELEASE, 40 ShareableFileReference::DELETE_ON_FINAL_RELEASE,
41 task_runner.get()); 41 task_runner.get());
42 42
43 scoped_ptr<net::FileStream> file_stream( 43 scoped_ptr<net::FileStream> file_stream(
44 new net::FileStream(file_proxy->TakeFile(), task_runner)); 44 new net::FileStream(file_proxy->TakeFile(), task_runner));
45 45
46 callback.Run(error_code, file_stream.Pass(), deletable_file.get()); 46 callback.Run(error_code, file_stream.Pass(), deletable_file.get());
47 } 47 }
48 48
49 } // namespace 49 } // namespace
50 50
51 void CreateTemporaryFileStream( 51 void CreateTemporaryFileStream(
52 const CreateTemporaryFileStreamCallback& callback) { 52 const CreateTemporaryFileStreamCallback& callback) {
53 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 53 DCHECK_CURRENTLY_ON(BrowserThread::IO);
54 54
55 scoped_ptr<base::FileProxy> file_proxy(new base::FileProxy( 55 scoped_ptr<base::FileProxy> file_proxy(new base::FileProxy(
56 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE).get())); 56 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE).get()));
57 base::FileProxy* proxy = file_proxy.get(); 57 base::FileProxy* proxy = file_proxy.get();
58 proxy->CreateTemporary( 58 proxy->CreateTemporary(
59 base::File::FLAG_ASYNC, 59 base::File::FLAG_ASYNC,
60 base::Bind(&DidCreateTemporaryFile, callback, Passed(&file_proxy))); 60 base::Bind(&DidCreateTemporaryFile, callback, Passed(&file_proxy)));
61 } 61 }
62 62
63 } // namespace content 63 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/resource_loader.cc ('k') | content/browser/media/android/media_resource_getter_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698