From d14c7ac0a14a2dc3984022aeadf830a3e30c99f3 Mon Sep 17 00:00:00 2001 From: "hclam@chromium.org" Date: Fri, 29 May 2009 20:38:11 +0000 Subject: Remove code path that passes a file handle to the renderer Since the code now does range request without any caching the code path for passing file handle is not used any more. Changes: 1. Remove response_data_file in webkit_glue::ResourceResponseHead 2. Remove response_data_file in net::ResourceInfo 3. Remove code that passes file handle using IPC 4. Remove code that passes file hadnle from network layer to ResourceDispatcherHost 5. Remove MediaResourceHandler 6. Remove code in disk_cache that expose the file handle 7. Remove ChromeURLRequestContext::CreateOffTheRecordForMedia() so no more OTR request context for media, in OTR mode simply memory cache is used 8. Reset cache size for media cache to default BUG=12249 BUG=12256 Review URL: http://codereview.chromium.org/113931 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17227 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/resource_loader_bridge.cc | 6 ------ webkit/glue/resource_loader_bridge.h | 21 --------------------- 2 files changed, 27 deletions(-) (limited to 'webkit') diff --git a/webkit/glue/resource_loader_bridge.cc b/webkit/glue/resource_loader_bridge.cc index 97832f1..d7b535c3 100644 --- a/webkit/glue/resource_loader_bridge.cc +++ b/webkit/glue/resource_loader_bridge.cc @@ -15,12 +15,6 @@ namespace webkit_glue { ResourceLoaderBridge::ResponseInfo::ResponseInfo() { content_length = -1; app_cache_id = WebAppCacheContext::kNoAppCacheId; -#if defined(OS_WIN) - response_data_file = base::kInvalidPlatformFileValue; -#elif defined(OS_POSIX) - response_data_file.fd = base::kInvalidPlatformFileValue; - response_data_file.auto_close = false; -#endif } ResourceLoaderBridge::ResponseInfo::~ResponseInfo() { diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h index 1a3809d..813cd05 100644 --- a/webkit/glue/resource_loader_bridge.h +++ b/webkit/glue/resource_loader_bridge.h @@ -70,20 +70,6 @@ class ResourceLoaderBridge { // The appcache this response was loaded from, or kNoAppCacheId. int64 app_cache_id; - - // A platform specific handle for a file that carries response data. This - // entry is used if the resource request is of type ResourceType::MEDIA and - // the underlying cache layer keeps the response data in a standalone file. -#if defined(OS_POSIX) - // If the response data file is available, the file handle is stored in - // response_data_file.fd, its value is base::kInvalidPlatformFileValue - // otherwise. - base::FileDescriptor response_data_file; -#elif defined(OS_WIN) - // An asynchronous file handle to the response data file, its value is - // base::kInvalidPlatformFileValue if the file is not available. - base::PlatformFile response_data_file; -#endif }; // See the SyncLoad method declared below. (The name of this struct is not @@ -114,13 +100,6 @@ class ResourceLoaderBridge { public: virtual ~Peer() {} - // Called as download progress is made. - // note: only for requests with LOAD_ENABLE_DOWNLOAD_FILE set and the - // resource is downloaded to a standalone file and the file handle to it is - // passed in ResponseInfo during OnReceivedResponse. Note that size may be - // unknown and |size| will be kuint64max in that case. - virtual void OnDownloadProgress(uint64 position, uint64 size) {} - // Called as upload progress is made. // note: only for requests with LOAD_ENABLE_UPLOAD_PROGRESS set virtual void OnUploadProgress(uint64 position, uint64 size) = 0; -- cgit v1.1