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

Side by Side Diff: webkit/browser/blob/local_file_stream_reader.cc

Issue 323683002: net: FileStream cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add DCHECK, fix ASSERT message Created 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/blob/local_file_stream_reader.h" 5 #include "webkit/browser/blob/local_file_stream_reader.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_util_proxy.h" 8 #include "base/files/file_util_proxy.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 99 }
100 100
101 void LocalFileStreamReader::DidOpenFileStream( 101 void LocalFileStreamReader::DidOpenFileStream(
102 const net::CompletionCallback& callback, 102 const net::CompletionCallback& callback,
103 int result) { 103 int result) {
104 if (result != net::OK) { 104 if (result != net::OK) {
105 callback.Run(result); 105 callback.Run(result);
106 return; 106 return;
107 } 107 }
108 result = stream_impl_->Seek( 108 result = stream_impl_->Seek(
109 net::FROM_BEGIN, initial_offset_, 109 base::File::FROM_BEGIN, initial_offset_,
110 base::Bind(&LocalFileStreamReader::DidSeekFileStream, 110 base::Bind(&LocalFileStreamReader::DidSeekFileStream,
111 weak_factory_.GetWeakPtr(), 111 weak_factory_.GetWeakPtr(),
112 callback)); 112 callback));
113 if (result != net::ERR_IO_PENDING) { 113 if (result != net::ERR_IO_PENDING) {
114 callback.Run(result); 114 callback.Run(result);
115 } 115 }
116 } 116 }
117 117
118 void LocalFileStreamReader::DidSeekFileStream( 118 void LocalFileStreamReader::DidSeekFileStream(
119 const net::CompletionCallback& callback, 119 const net::CompletionCallback& callback,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 return; 160 return;
161 } 161 }
162 if (!VerifySnapshotTime(expected_modification_time_, file_info)) { 162 if (!VerifySnapshotTime(expected_modification_time_, file_info)) {
163 callback.Run(net::ERR_UPLOAD_FILE_CHANGED); 163 callback.Run(net::ERR_UPLOAD_FILE_CHANGED);
164 return; 164 return;
165 } 165 }
166 callback.Run(file_info.size); 166 callback.Run(file_info.size);
167 } 167 }
168 168
169 } // namespace webkit_blob 169 } // namespace webkit_blob
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698