Move HistoryItem handling to DocumentLoader

third_party/WebKit/Source/core/dom/Document.cpp

Index: third_party/WebKit/Source/core/dom/Document.cpp
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index a1481a308f4261799da7bd1290155e90156eb33d..6dcfb95222660dd619731a2f9d0b19cf1815fbb9 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -1632,10 +1632,9 @@ Node::NodeType Document::getNodeType() const {
 FormController& Document::formController() {
   if (!m_formController) {
     m_formController = FormController::create();
-    if (m_frame && m_frame->loader().currentItem() &&
-        m_frame->loader().currentItem()->isCurrentDocument(this))
-      m_frame->loader().currentItem()->setDocumentState(
-          m_formController->formElementsState());
+    HistoryItem* historyItem = loader() ? loader()->historyItem() : nullptr;
+    if (historyItem)
+      historyItem->setDocumentState(m_formController->formElementsState());
   }
   return *m_formController;
 }