summaryrefslogtreecommitdiffstats
path: root/net/base/file_stream_win.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/base/file_stream_win.cc')
-rw-r--r--net/base/file_stream_win.cc43
1 files changed, 11 insertions, 32 deletions
diff --git a/net/base/file_stream_win.cc b/net/base/file_stream_win.cc
index 3119a26..cec6a9d 100644
--- a/net/base/file_stream_win.cc
+++ b/net/base/file_stream_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this
+// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this
// source code is governed by a BSD-style license that can be found in the
// LICENSE file.
@@ -120,10 +120,16 @@ FileStream::FileStream()
open_flags_(0) {
}
-FileStream::FileStream(base::PlatformFile file, int open_flags)
- : file_(INVALID_HANDLE_VALUE),
- open_flags_(0) {
- Open(file, open_flags);
+FileStream::FileStream(base::PlatformFile file, int flags)
+ : file_(file),
+ open_flags_(flags) {
+ // If the file handle is opened with base::PLATFORM_FILE_ASYNC, we need to
+ // make sure we will perform asynchronous File IO to it.
+ if (flags & base::PLATFORM_FILE_ASYNC) {
+ async_context_.reset(new AsyncContext(this));
+ MessageLoopForIO::current()->RegisterIOHandler(file_,
+ async_context_.get());
+ }
}
FileStream::~FileStream() {
@@ -141,13 +147,6 @@ void FileStream::Close() {
}
}
-void FileStream::Release() {
- if (file_ != INVALID_HANDLE_VALUE)
- CancelIo(file_);
- async_context_.reset();
- file_ = INVALID_HANDLE_VALUE;
-}
-
int FileStream::Open(const FilePath& path, int open_flags) {
if (IsOpen()) {
DLOG(FATAL) << "File is already open!";
@@ -171,26 +170,6 @@ int FileStream::Open(const FilePath& path, int open_flags) {
return OK;
}
-int FileStream::Open(base::PlatformFile file, int open_flags) {
- if (IsOpen()) {
- DLOG(FATAL) << "File is already open!";
- return ERR_UNEXPECTED;
- }
-
- open_flags_ = open_flags;
- file_ = file;
-
- // If the file handle is opened with base::PLATFORM_FILE_ASYNC, we need to
- // make sure we will perform asynchronous File IO to it.
- if (open_flags_ & base::PLATFORM_FILE_ASYNC) {
- async_context_.reset(new AsyncContext(this));
- MessageLoopForIO::current()->RegisterIOHandler(file_,
- async_context_.get());
- }
-
- return OK;
-}
-
bool FileStream::IsOpen() const {
return file_ != INVALID_HANDLE_VALUE;
}