Index: webkit/fileapi/file_system_url_request_job.h |
=================================================================== |
--- webkit/fileapi/file_system_url_request_job.h (revision 132160) |
+++ webkit/fileapi/file_system_url_request_job.h (working copy) |
@@ -19,8 +19,11 @@ |
class GURL; |
class FilePath; |
+namespace net { |
+class FileStream; |
+} |
+ |
namespace webkit_blob { |
-class LocalFileReader; |
class ShareableFileReference; |
} |
@@ -70,7 +73,7 @@ |
FileSystemContext* file_system_context_; |
scoped_refptr<base::MessageLoopProxy> file_thread_proxy_; |
base::WeakPtrFactory<FileSystemURLRequestJob> weak_factory_; |
- scoped_ptr<webkit_blob::LocalFileReader> reader_; |
+ scoped_ptr<net::FileStream> stream_; |
scoped_refptr<webkit_blob::ShareableFileReference> snapshot_ref_; |
bool is_directory_; |
scoped_ptr<net::HttpResponseInfo> response_info_; |
Property changes on: webkit/fileapi/file_system_url_request_job.h |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/src/webkit/fileapi/file_system_url_request_job.h:r3734-4217,4606-5108,5177-5263 |