Move HistoryItem handling to DocumentLoader

third_party/WebKit/Source/web/ContextMenuClientImpl.cpp

 /*
  * Copyright (C) 2009, 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 283 matching lines @@
     // in that case. See https://crbug.com/534561
     WebSecurityOrigin origin = m_webView->mainFrame()->getSecurityOrigin();
     if (!origin.isNull())
       data.pageURL = KURL(ParsedURLString, origin.toString());
   } else {
     data.pageURL = urlFromFrame(toLocalFrame(m_webView->page()->mainFrame()));
   }
 
   if (selectedFrame != m_webView->page()->mainFrame()) {
     data.frameURL = urlFromFrame(selectedFrame);
-    HistoryItem* historyItem = selectedFrame->loader().currentItem();
+    HistoryItem* historyItem =
+        selectedFrame->loader().documentLoader()->historyItem();
     if (historyItem)
       data.frameHistoryItem = WebHistoryItem(historyItem);
   }
 
   // HitTestResult::isSelected() ensures clean layout by performing a hit test.
   if (r.isSelected()) {
     if (!isHTMLInputElement(*r.innerNode()) ||
         toHTMLInputElement(r.innerNode())->type() != InputTypeNames::password) {
       data.selectedText = selectedFrame->selectedText().stripWhiteSpace();
     }
@@ skipping 136 matching lines @@
   subMenuItems.swap(outputItems);
 }
 
 void ContextMenuClientImpl::populateCustomMenuItems(
     const ContextMenu* defaultMenu,
     WebContextMenuData* data) {
   populateSubMenuItems(defaultMenu->items(), data->customItems);
 }
 
 }  // namespace blink