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

Side by Side Diff: content/browser/renderer_host/resource_dispatcher_host_impl.cc

Issue 10878082: net: Move file operation code from UploadData to UploadDataStream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove initialization check from IsInMemory Created 8 years, 3 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
« no previous file with comments | « chrome_frame/urlmon_upload_data_stream.cc ('k') | net/base/upload_data.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" 7 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "content/public/common/process_type.h" 62 #include "content/public/common/process_type.h"
63 #include "content/public/common/url_constants.h" 63 #include "content/public/common/url_constants.h"
64 #include "net/base/auth.h" 64 #include "net/base/auth.h"
65 #include "net/base/cert_status_flags.h" 65 #include "net/base/cert_status_flags.h"
66 #include "net/base/load_flags.h" 66 #include "net/base/load_flags.h"
67 #include "net/base/mime_util.h" 67 #include "net/base/mime_util.h"
68 #include "net/base/net_errors.h" 68 #include "net/base/net_errors.h"
69 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 69 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
70 #include "net/base/request_priority.h" 70 #include "net/base/request_priority.h"
71 #include "net/base/ssl_cert_request_info.h" 71 #include "net/base/ssl_cert_request_info.h"
72 #include "net/base/upload_data.h" 72 #include "net/base/upload_data_stream.h"
73 #include "net/cookies/cookie_monster.h" 73 #include "net/cookies/cookie_monster.h"
74 #include "net/http/http_cache.h" 74 #include "net/http/http_cache.h"
75 #include "net/http/http_response_headers.h" 75 #include "net/http/http_response_headers.h"
76 #include "net/http/http_response_info.h" 76 #include "net/http/http_response_info.h"
77 #include "net/http/http_transaction_factory.h" 77 #include "net/http/http_transaction_factory.h"
78 #include "net/url_request/url_request.h" 78 #include "net/url_request/url_request.h"
79 #include "net/url_request/url_request_context.h" 79 #include "net/url_request/url_request_context.h"
80 #include "net/url_request/url_request_job_factory.h" 80 #include "net/url_request/url_request_job_factory.h"
81 #include "webkit/appcache/appcache_interceptor.h" 81 #include "webkit/appcache/appcache_interceptor.h"
82 #include "webkit/appcache/appcache_interfaces.h" 82 #include "webkit/appcache/appcache_interfaces.h"
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 request->set_priority(DetermineRequestPriority(request_data.resource_type)); 958 request->set_priority(DetermineRequestPriority(request_data.resource_type));
959 959
960 // Resolve elements from request_body and prepare upload data. 960 // Resolve elements from request_body and prepare upload data.
961 uint64 upload_size = 0; 961 uint64 upload_size = 0;
962 if (request_data.request_body) { 962 if (request_data.request_body) {
963 request->set_upload( 963 request->set_upload(
964 request_data.request_body->ResolveElementsAndCreateUploadData( 964 request_data.request_body->ResolveElementsAndCreateUploadData(
965 GetBlobStorageControllerForResourceContext(resource_context))); 965 GetBlobStorageControllerForResourceContext(resource_context)));
966 // This results in performing file IO. crbug.com/112607. 966 // This results in performing file IO. crbug.com/112607.
967 base::ThreadRestrictions::ScopedAllowIO allow_io; 967 base::ThreadRestrictions::ScopedAllowIO allow_io;
968 upload_size = request->get_upload_mutable()->GetContentLengthSync(); 968 net::UploadDataStream upload_stream(request->get_upload_mutable());
969 if (upload_stream.Init() == net::OK)
willchan no longer on Chromium 2012/08/28 23:45:22 I'm concerned about calling Init() here. Doesn't t
hashimoto 2012/08/28 23:49:56 You're right. Resetting offsets here is wrong. We
willchan no longer on Chromium 2012/08/28 23:59:36 I read everything else already. That was my only c
970 upload_size = upload_stream.size();
969 } 971 }
970 972
971 bool allow_download = request_data.allow_download && 973 bool allow_download = request_data.allow_download &&
972 ResourceType::IsFrame(request_data.resource_type); 974 ResourceType::IsFrame(request_data.resource_type);
973 975
974 // Make extra info and read footer (contains request ID). 976 // Make extra info and read footer (contains request ID).
975 ResourceRequestInfoImpl* extra_info = 977 ResourceRequestInfoImpl* extra_info =
976 new ResourceRequestInfoImpl( 978 new ResourceRequestInfoImpl(
977 process_type, 979 process_type,
978 child_id, 980 child_id,
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
1728 1730
1729 return i->second.get(); 1731 return i->second.get();
1730 } 1732 }
1731 1733
1732 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id, 1734 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id,
1733 int request_id) const { 1735 int request_id) const {
1734 return GetLoader(GlobalRequestID(child_id, request_id)); 1736 return GetLoader(GlobalRequestID(child_id, request_id));
1735 } 1737 }
1736 1738
1737 } // namespace content 1739 } // namespace content
OLDNEW
« no previous file with comments | « chrome_frame/urlmon_upload_data_stream.cc ('k') | net/base/upload_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698