Move ExtraData from WebRequest to WebDataSource....

webkit/glue/webframeloaderclient_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 
@@ skipping 669 matching lines @@
       ds->AppendRedirect(chain_end);
       // Make sure we clear the expected redirect since we just effectively
       // completed it.
       expected_client_redirect_src_ = GURL();
       expected_client_redirect_dest_ = GURL();
      }
 
     // Regardless of how we got here, we are navigating to a URL so we need to
     // add it to the redirect chain.
     ds->AppendRedirect(url);
-
-    // WebKit will re-use requests for in-page navigations, but we want to
-    // think of it as a new request that has a page ID in session history.
-    // This will set the proper page ID, etc. on the request so that the
-    // browser will treat it properly.
-    webframe_->CacheCurrentRequestInfo(ds);
   }
 
   bool is_new_navigation;
   webview->DidCommitLoad(&is_new_navigation);
   if (d) {
     d->DidChangeLocationWithinPageForFrame(webview, webframe_,
                                            is_new_navigation);
   }
 
   if (d)
@@ skipping 634 matching lines @@
     plg_delegate->DidFinishLoadWithReason(NPRES_DONE);
 }
 void WebFrameLoaderClient::prepareForDataSourceReplacement() {
   // FIXME
 }
 
 PassRefPtr<DocumentLoader> WebFrameLoaderClient::createDocumentLoader(
     const ResourceRequest& request,
     const SubstituteData& data) {
   RefPtr<WebDataSourceImpl> ds = WebDataSourceImpl::Create(request, data);
-  webframe_->CacheCurrentRequestInfo(ds.get());
+  WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate();
+  if (d)
+    d->DidCreateDataSource(webframe_, ds.get());
   return ds.release();
 }
 
 void WebFrameLoaderClient::setTitle(const String& title, const KURL& url) {
   // FIXME: monitor for changes in WebFrameLoaderClient.mm
   // FIXME: Set the title of the current history item. HistoryItemImpl's setter
   //        will notify its clients (e.g. the history database) that the title
   //        has changed.
   //
   // e.g.:
@@ skipping 304 matching lines @@
   if (!web_view) {
     return NULL;
   }
   WebDevToolsAgentImpl* tools_agent = web_view->GetWebDevToolsAgentImpl();
   if (tools_agent) {
     return tools_agent->net_agent_impl();
   } else {
     return NULL;
   }
 }