Remove the HistoryState property of WebRequest....

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 390 matching lines @@
 
   // We must call init() after frame_ is assigned because it is referenced
   // during init().
   frame_->init();
 
   // Inform the  browser process of this top-level frame
   app_cache_context_->Initialize(WebAppCacheContext::MAIN_FRAME, NULL);
 }
 
 void WebFrameImpl::LoadRequest(WebRequest* request) {
-  SubstituteData data;
-  InternalLoadRequest(request, data, false);
+  InternalLoadRequest(request, SubstituteData(), NULL, false);
+}
+
+void WebFrameImpl::LoadHistoryState(const std::string& history_state) {
+  RefPtr<HistoryItem> history_item =
+      webkit_glue::HistoryItemFromString(history_state);
+  DCHECK(history_item.get());
+
+  WebRequestImpl dummy_request;
+  InternalLoadRequest(&dummy_request, SubstituteData(), history_item, false);
 }
 
 void WebFrameImpl::InternalLoadRequest(const WebRequest* request,
                                        const SubstituteData& data,
+                                       PassRefPtr<HistoryItem> history_item,
                                        bool replace) {
   const WebRequestImpl* request_impl =
       static_cast<const WebRequestImpl*>(request);
 
   const ResourceRequest& resource_request =
       request_impl->frame_load_request().resourceRequest();
 
   // Special-case javascript URLs.  Do not interrupt the existing load when
   // asked to load a javascript URL unless the script generates a result.
   // We can't just use FrameLoader::executeIfJavaScriptURL because it doesn't
@@ skipping 26 matching lines @@
 
   StopLoading();  // make sure existing activity stops
 
   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()) {
+  } else if (history_item.get()) {
     // Use the history item if we have one, otherwise fall back to standard
     // load.
     RefPtr<HistoryItem> current_item = frame_->loader()->currentHistoryItem();
 
     // If there is no current_item, which happens when we are navigating in
     // session history after a crash, we need to manufacture one otherwise
     // WebKit hoarks. This is probably the wrong thing to do, but it seems to
     // work.
     if (!current_item) {
       current_item = HistoryItem::create();
       current_item->setLastVisitWasFailure(true);
       frame_->loader()->setCurrentHistoryItem(current_item);
       GetWebViewImpl()->SetCurrentHistoryItem(current_item.get());
     }
 
-    frame_->loader()->goToItem(request_impl->history_item().get(),
+    frame_->loader()->goToItem(history_item.get(),
                                WebCore::FrameLoadTypeIndexedBackForward);
   } else if (resource_request.cachePolicy() == ReloadIgnoringCacheData) {
     frame_->loader()->reload();
   } else {
     frame_->loader()->load(resource_request, false);
   }
 }
 
 void WebFrameImpl::LoadHTMLString(const std::string& html_text,
                                   const GURL& base_url) {
   WebRequestImpl request(base_url);
   LoadAlternateHTMLString(&request, html_text, GURL(), false);
 }
 
 void WebFrameImpl::LoadAlternateHTMLString(const WebRequest* request,
                                            const std::string& html_text,
                                            const GURL& display_url,
                                            bool replace) {
   int len = static_cast<int>(html_text.size());
   RefPtr<SharedBuffer> buf = SharedBuffer::create(html_text.data(), len);
 
   SubstituteData subst_data(
       buf, String("text/html"), String("UTF-8"),
       webkit_glue::GURLToKURL(display_url));
   DCHECK(subst_data.isValid());
 
-  InternalLoadRequest(request, subst_data, replace);
+  InternalLoadRequest(request, subst_data, NULL, replace);
 }
 
 GURL WebFrameImpl::GetURL() const {
   const WebDataSource* ds = GetDataSource();
   if (!ds)
     return GURL();
   return ds->GetRequest().GetURL();
 }
 
 GURL WebFrameImpl::GetFavIconURL() const {
@@ skipping 1372 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();
 }