Move HistoryItem handling to DocumentLoader

third_party/WebKit/Source/core/loader/HistoryItem.cpp

 /*
  * Copyright (C) 2005, 2006, 2008, 2011 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/loader/HistoryItem.h"
 
 #include "core/dom/Document.h"

[yhirano, 2017/03/29 09:38:13]

-include

[Nate Chapin, 2017/03/29 18:23:06]

Done.

 #include "core/html/forms/FormController.h"
 #include "platform/loader/fetch/ResourceRequest.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "wtf/Assertions.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/text/CString.h"
 
 namespace blink {
 
 static long long generateSequenceNumber() {
@@ skipping 116 matching lines @@
 }
 
 void HistoryItem::setFormContentType(const AtomicString& formContentType) {
   m_formContentType = formContentType;
 }
 
 EncodedFormData* HistoryItem::formData() {
   return m_formData.get();
 }
 
-bool HistoryItem::isCurrentDocument(Document* doc) const {
-  // FIXME: We should find a better way to check if this is the current
-  // document.
-  return equalIgnoringFragmentIdentifier(url(), doc->url());
+ResourceRequest HistoryItem::generateResourceRequest(
+    WebCachePolicy cachePolicy) {
+  ResourceRequest request(m_urlString);
+  request.setHTTPReferrer(m_referrer);
+  request.setCachePolicy(cachePolicy);
+  if (m_formData) {
+    request.setHTTPMethod(HTTPNames::POST);
+    request.setHTTPBody(m_formData.get());

[yhirano, 2017/03/29 09:38:13]

get() is not needed.

[Nate Chapin, 2017/03/29 18:23:06]

Done.

+    request.setHTTPContentType(m_formContentType);
+    request.addHTTPOriginIfNeeded(m_referrer.referrer);
+  }
+  return request;
 }
 
 DEFINE_TRACE(HistoryItem) {
   visitor->trace(m_documentState);
 }
 
 }  // namespace blink