Modify ResourceFetcher to use WebURLLoader instead of ResourceHandle....

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 177 matching lines @@
 using WebCore::HTMLFormElement;
 using WebCore::IntRect;
 using WebCore::KURL;
 using WebCore::Node;
 using WebCore::Range;
 using WebCore::ReloadIgnoringCacheData;
 using WebCore::RenderObject;
 using WebCore::ResourceError;
 using WebCore::ResourceHandle;
 using WebCore::ResourceRequest;
+using WebCore::ResourceResponse;
 using WebCore::VisibleSelection;
 using WebCore::ScriptValue;
 using WebCore::SecurityOrigin;
 using WebCore::SharedBuffer;
 using WebCore::String;
 using WebCore::SubstituteData;
 using WebCore::TextIterator;
 using WebCore::VisiblePosition;
 using WebCore::XPathResult;
 
 using WebKit::WebCanvas;
 using WebKit::WebConsoleMessage;
 using WebKit::WebData;
 using WebKit::WebDataSource;
 using WebKit::WebFindOptions;
 using WebKit::WebHistoryItem;
 using WebKit::WebForm;
 using WebKit::WebRect;
 using WebKit::WebScriptSource;
 using WebKit::WebSize;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebURLError;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 
+using webkit_glue::AltErrorPageResourceFetcher;
+
 // Key for a StatsCounter tracking how many WebFrames are active.
 static const char* const kWebFrameActiveCount = "WebFrameActiveCount";
 
 static const char* const kOSDType = "application/opensearchdescription+xml";
 static const char* const kOSDRel = "search";
 
 // The separator between frames when the frames are converted to plain text.
 static const wchar_t kFrameSeparator[] = L"\n\n";
 static const int kFrameSeparatorLen = arraysize(kFrameSeparator) - 1;
 
@@ skipping 1325 matching lines @@
   // Load alternate HTML in place of the previous request.  We use a fake_url
   // for the Base URL.  That prevents other web content from the same origin
   // as the failed URL to script the error page.
 
   LoadHTMLString("",  // Empty document
                  fake_url,
                  error.unreachableURL,
                  replace);
 
   alt_error_page_fetcher_.reset(new AltErrorPageResourceFetcher(
-      GetWebViewImpl(), error, this, error_page_url));
+      GetWebViewImpl(), this, error, error_page_url));
+}
+
+void WebFrameImpl::DispatchWillSendRequest(WebURLRequest* request) {
+  ResourceResponse response;
+  frame_->loader()->client()->dispatchWillSendRequest(NULL, 0,
+      *webkit_glue::WebURLRequestToMutableResourceRequest(request),
+      response);
 }
 
 void WebFrameImpl::ExecuteScript(const WebScriptSource& source) {
   frame_->loader()->executeScript(
       WebCore::ScriptSourceCode(
           webkit_glue::WebStringToString(source.code),
           webkit_glue::WebURLToKURL(source.url),
           source.startLine));
 }
 
@@ skipping 240 matching lines @@
 
   SecurityOrigin* security_origin = frame_->document()->securityOrigin();
 
   if (!frame_->loader()->isScheduledLocationChangePending()) {
     frame_->loader()->stopAllLoaders();
     frame_->loader()->begin(frame_->loader()->url(), true, security_origin);
     frame_->loader()->write(script_result);
     frame_->loader()->end();
   }
 }