summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/resource_fetcher.cc17
-rw-r--r--webkit/glue/resource_fetcher.h6
2 files changed, 2 insertions, 21 deletions
diff --git a/webkit/glue/resource_fetcher.cc b/webkit/glue/resource_fetcher.cc
index 9d6379c..b72ea54 100644
--- a/webkit/glue/resource_fetcher.cc
+++ b/webkit/glue/resource_fetcher.cc
@@ -46,27 +46,14 @@ void ResourceFetcher::Cancel() {
}
void ResourceFetcher::Start(WebCore::Frame* frame) {
- WebCore::FrameLoader* frame_loader = frame->loader();
- if (!frame_loader) {
- // We put this on a 0 timer so the callback happens async (consistent with
- // regular fetches).
- start_failed_timer_.reset(new StartFailedTimer(this,
- &ResourceFetcher::StartFailed));
- start_failed_timer_->startOneShot(0);
- return;
- }
-
WebCore::ResourceRequest request(webkit_glue::GURLToKURL(url_));
WebCore::ResourceResponse response;
- frame_loader->client()->dispatchWillSendRequest(NULL, 0, request, response);
+ frame->loader()->client()->dispatchWillSendRequest(NULL, 0, request,
+ response);
loader_ = ResourceHandle::create(request, this, NULL, false, false);
}
-void ResourceFetcher::StartFailed(StartFailedTimer* timer) {
- didFail(NULL, ResourceError());
-}
-
/////////////////////////////////////////////////////////////////////////////
// ResourceHandleClient methods
void ResourceFetcher::didReceiveResponse(ResourceHandle* resource_handle,
diff --git a/webkit/glue/resource_fetcher.h b/webkit/glue/resource_fetcher.h
index c44fc61..8b00239 100644
--- a/webkit/glue/resource_fetcher.h
+++ b/webkit/glue/resource_fetcher.h
@@ -85,12 +85,6 @@ class ResourceFetcher : public WebCore::ResourceHandleClient {
// Start the actual download.
void Start(WebCore::Frame* frame);
- // Callback function if Start fails.
- void StartFailed(StartFailedTimer* timer);
-
- // Timer for calling StartFailed async.
- scoped_ptr<StartFailedTimer> start_failed_timer_;
-
// Buffer to hold the content from the server.
std::string data_;
};