Move HistoryItem handling to DocumentLoader

third_party/WebKit/Source/core/frame/History.cpp

 /*
  * Copyright (C) 2007 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
@@ skipping 59 matching lines @@
 
 SerializedScriptValue* History::state() {
   m_lastStateObjectRequested = stateInternal();
   return m_lastStateObjectRequested.get();
 }
 
 SerializedScriptValue* History::stateInternal() const {
   if (!frame())
     return 0;
 
-  if (HistoryItem* historyItem = frame()->loader().currentItem())
+  if (HistoryItem* historyItem =
+          frame()->loader().documentLoader()->historyItem()) {

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

Can |frame()->loader().documentLoader()| be null? Ditto below.

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

I *think* it can't. FrameLoader::documentLoader() should only be null during
frame detach, and if the frame is detaching, DOMWindowClient::frame() (i.e., the
frame() here) should be null.

     return historyItem->stateObject();
+  }
 
   return 0;
 }
 
 void History::setScrollRestoration(const String& value) {
   DCHECK(value == "manual" || value == "auto");
   if (!frame() || !frame()->loader().client())
     return;
 
   HistoryScrollRestorationType scrollRestoration =
       value == "manual" ? ScrollRestorationManual : ScrollRestorationAuto;
   if (scrollRestoration == scrollRestorationInternal())
     return;
 
-  if (HistoryItem* historyItem = frame()->loader().currentItem()) {
+  if (HistoryItem* historyItem =
+          frame()->loader().documentLoader()->historyItem()) {
     historyItem->setScrollRestorationType(scrollRestoration);
     frame()->loader().client()->didUpdateCurrentHistoryItem();
   }
 }
 
 String History::scrollRestoration() {
   return scrollRestorationInternal() == ScrollRestorationManual ? "manual"
                                                                 : "auto";
 }
 
 HistoryScrollRestorationType History::scrollRestorationInternal() const {
-  if (frame()) {
-    if (HistoryItem* historyItem = frame()->loader().currentItem())
-      return historyItem->scrollRestorationType();
-  }
-
-  return ScrollRestorationAuto;
+  HistoryItem* historyItem =
+      frame() ? frame()->loader().documentLoader()->historyItem() : nullptr;
+  return historyItem ? historyItem->scrollRestorationType()
+                     : ScrollRestorationAuto;
 }
 
 bool History::stateChanged() const {
   return m_lastStateObjectRequested != stateInternal();
 }
 
 bool History::isSameAsCurrentState(SerializedScriptValue* state) const {
   return state == stateInternal();
 }
 
@@ skipping 101 matching lines @@
         frame()->document()->url().elidedString() + "'.");
     return;
   }
 
   frame()->loader().updateForSameDocumentNavigation(
       fullURL, SameDocumentNavigationHistoryApi, std::move(data),
       restorationType, type, frame()->document());
 }
 
 }  // namespace blink