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

Side by Side Diff: webkit/common/blob/scoped_file.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "webkit/common/blob/scoped_file.h" 5 #include "webkit/common/blob/scoped_file.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_util_proxy.h" 9 #include "base/files/file_util_proxy.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 23 matching lines...) Expand all
34 } 34 }
35 35
36 ScopedFile::~ScopedFile() { 36 ScopedFile::~ScopedFile() {
37 Reset(); 37 Reset();
38 } 38 }
39 39
40 void ScopedFile::AddScopeOutCallback( 40 void ScopedFile::AddScopeOutCallback(
41 const ScopeOutCallback& callback, 41 const ScopeOutCallback& callback,
42 base::TaskRunner* callback_runner) { 42 base::TaskRunner* callback_runner) {
43 if (!callback_runner) 43 if (!callback_runner)
44 callback_runner = base::MessageLoopProxy::current(); 44 callback_runner = base::MessageLoopProxy::current().get();
45 scope_out_callbacks_.push_back(std::make_pair(callback, callback_runner)); 45 scope_out_callbacks_.push_back(std::make_pair(callback, callback_runner));
46 } 46 }
47 47
48 base::FilePath ScopedFile::Release() { 48 base::FilePath ScopedFile::Release() {
49 base::FilePath path = path_; 49 base::FilePath path = path_;
50 path_.clear(); 50 path_.clear();
51 scope_out_callbacks_.clear(); 51 scope_out_callbacks_.clear();
52 scope_out_policy_ = DONT_DELETE_ON_SCOPE_OUT; 52 scope_out_policy_ = DONT_DELETE_ON_SCOPE_OUT;
53 return path; 53 return path;
54 } 54 }
(...skipping 21 matching lines...) Expand all
76 void ScopedFile::MoveFrom(ScopedFile& other) { 76 void ScopedFile::MoveFrom(ScopedFile& other) {
77 Reset(); 77 Reset();
78 78
79 scope_out_policy_ = other.scope_out_policy_; 79 scope_out_policy_ = other.scope_out_policy_;
80 scope_out_callbacks_.swap(other.scope_out_callbacks_); 80 scope_out_callbacks_.swap(other.scope_out_callbacks_);
81 file_task_runner_ = other.file_task_runner_; 81 file_task_runner_ = other.file_task_runner_;
82 path_ = other.Release(); 82 path_ = other.Release();
83 } 83 }
84 84
85 } // namespace webkit_blob 85 } // namespace webkit_blob
OLDNEW
« no previous file with comments | « webkit/browser/quota/quota_manager_unittest.cc ('k') | webkit/glue/resource_request_body_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698