Move ExtraData from WebRequest to WebDataSource....

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 444 matching lines @@
     return;
   }
 
   StopLoading();  // make sure existing activity stops
 
   // Keep track of the request temporarily.  This is effectively a way of
   // passing the request to callbacks that may need it.  See
   // WebFrameLoaderClient::createDocumentLoader.
   currently_loading_request_ = request;
 
-  // If we have a current datasource, save the request info on it immediately.
-  // This is because WebCore may not actually initiate a load on the toplevel
-  // frame for some subframe navigations, so we want to update its request.
-  WebDataSourceImpl* datasource = GetDataSourceImpl();
-  if (datasource)
-    CacheCurrentRequestInfo(datasource);
-
   if (data.isValid()) {
     frame_->loader()->load(resource_request, data, false);
     if (replace) {
       // Do this to force WebKit to treat the load as replacing the currently
       // loaded page.
       frame_->loader()->setReplacing();
     }
   } else if (request_impl->history_item()) {
     // Use the history item if we have one, otherwise fall back to standard
     // load.
@@ skipping 170 matching lines @@
   if (!doc_loader)
     doc_loader = frame_loader->policyDocumentLoader();
 
   return DataSourceForDocLoader(doc_loader);
 }
 
 WebDataSourceImpl* WebFrameImpl::GetProvisionalDataSourceImpl() const {
   return static_cast<WebDataSourceImpl*>(GetProvisionalDataSource());
 }
 
-void WebFrameImpl::CacheCurrentRequestInfo(WebDataSourceImpl* datasource) {
-  // Cache our current request info on the data source.  It contains its
-  // own requests, so the extra data needs to be transferred.
-  scoped_refptr<WebRequest::ExtraData> extra;
-
-  // Our extra data may come from a request issued via LoadRequest.
-  if (currently_loading_request_)
-    extra = currently_loading_request_->GetExtraData();
-
-  // We must only update this if it is valid, or the valid state will be lost.
-  if (extra)
-    datasource->SetExtraData(extra);
-}
-
 void WebFrameImpl::StopLoading() {
   if (!frame_)
     return;
 
   // TODO(darin): Figure out what we should really do here.  It seems like a
   // bug that FrameLoader::stopLoading doesn't call stopAllLoaders.
   frame_->loader()->stopAllLoaders();
   frame_->loader()->stopLoading(false);
 }
 
@@ skipping 1235 matching lines @@
   return password_listeners_.get(input_element);
 }
 
 void WebFrameImpl::ClearPasswordListeners() {
   for (PasswordListenerMap::iterator iter = password_listeners_.begin();
        iter != password_listeners_.end(); ++iter) {
     delete iter->second;
   }
   password_listeners_.clear();
 }