| Index: webkit/browser/appcache/appcache_update_job.h
|
| diff --git a/webkit/browser/appcache/appcache_update_job.h b/webkit/browser/appcache/appcache_update_job.h
|
| index 97ba905f4e78925725498d62e309f982c9f04e50..8dfd31c5f0f4201e117e91a97d2079cd9773a335 100644
|
| --- a/webkit/browser/appcache/appcache_update_job.h
|
| +++ b/webkit/browser/appcache/appcache_update_job.h
|
| @@ -127,6 +127,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheUpdateJob
|
| existing_entry_ = entry;
|
| }
|
| ResultType result() const { return result_; }
|
| + int canceled_response_code() const { return redirect_response_code_; }
|
|
|
| private:
|
| // URLRequest::Delegate overrides
|
| @@ -154,6 +155,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheUpdateJob
|
| scoped_refptr<net::HttpResponseHeaders> existing_response_headers_;
|
| std::string manifest_data_;
|
| ResultType result_;
|
| + int redirect_response_code_;
|
| scoped_ptr<AppCacheResponseWriter> response_writer_;
|
| }; // class URLFetcher
|
|
|
| @@ -166,7 +168,9 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheUpdateJob
|
| AppCache* newest_cache,
|
| bool success,
|
| bool would_exceed_quota) OVERRIDE;
|
| - virtual void OnGroupMadeObsolete(AppCacheGroup* group, bool success) OVERRIDE;
|
| + virtual void OnGroupMadeObsolete(AppCacheGroup* group,
|
| + bool success,
|
| + int response_code) OVERRIDE;
|
|
|
| // Methods for AppCacheHost::Observer.
|
| virtual void OnCacheSelectionComplete(AppCacheHost* host) OVERRIDE {} // N/A
|
| @@ -176,9 +180,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheUpdateJob
|
| virtual void OnServiceReinitialized(
|
| AppCacheStorageReference* old_storage) OVERRIDE;
|
|
|
| - void HandleCacheFailure(const std::string& error_message,
|
| - ResultType result,
|
| - const GURL& failed_resource_url);
|
| + void HandleCacheFailure(const ErrorDetails& details, ResultType result);
|
|
|
| void FetchManifest(bool is_first_fetch);
|
| void HandleManifestFetchCompleted(URLFetcher* fetcher);
|
| @@ -197,7 +199,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheUpdateJob
|
| void NotifyAllAssociatedHosts(EventID event_id);
|
| void NotifyAllProgress(const GURL& url);
|
| void NotifyAllFinalProgress();
|
| - void NotifyAllError(const std::string& error_message);
|
| + void NotifyAllError(const ErrorDetails& detals);
|
| void AddAllAssociatedHostsToNotifier(HostNotifier* notifier);
|
|
|
| // Checks if manifest is byte for byte identical with the manifest
|
| @@ -224,7 +226,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheUpdateJob
|
| void AddMasterEntryToFetchList(AppCacheHost* host, const GURL& url,
|
| bool is_new);
|
| void FetchMasterEntries();
|
| - void CancelAllMasterEntryFetches(const std::string& error_message);
|
| + void CancelAllMasterEntryFetches(const ErrorDetails& details);
|
|
|
| // Asynchronously loads the entry from the newest complete cache if the
|
| // HTTP caching semantics allow.
|
|
|