Split the frame tree logic out of HistoryItem

Source/core/testing/Internals.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 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.
@@ skipping 650 matching lines @@
 
 void Internals::selectColorInColorChooser(Element* element, const String& colorValue)
 {
     if (!element->hasTagName(inputTag))
         return;
     toHTMLInputElement(element)->selectColorInColorChooser(Color(colorValue));
 }
 
 Vector<String> Internals::formControlStateOfPreviousHistoryItem(ExceptionState& es)
 {
-    HistoryItem* mainItem = frame()->loader().history()->previousItem();
+    HistoryItem* mainItem = frame()->page()->history()->previousItem(frame());
     if (!mainItem) {
         es.throwUninformativeAndGenericDOMException(InvalidAccessError);
         return Vector<String>();
     }
-    String uniqueName = frame()->tree().uniqueName();
-    if (mainItem->target() != uniqueName && !mainItem->childItemWithTarget(uniqueName)) {
-        es.throwUninformativeAndGenericDOMException(InvalidAccessError);
-        return Vector<String>();
-    }
-    return mainItem->target() == uniqueName ? mainItem->documentState() : mainItem->childItemWithTarget(uniqueName)->documentState();
+    return mainItem->documentState();
 }
 
 void Internals::setFormControlStateOfPreviousHistoryItem(const Vector<String>& state, ExceptionState& es)
 {
-    HistoryItem* mainItem = frame()->loader().history()->previousItem();
+    HistoryItem* mainItem = frame()->page()->history()->previousItem(frame());
     if (!mainItem) {
         es.throwUninformativeAndGenericDOMException(InvalidAccessError);
         return;
     }
-    String uniqueName = frame()->tree().uniqueName();
-    if (mainItem->target() == uniqueName)
-        mainItem->setDocumentState(state);
-    else if (HistoryItem* subItem = mainItem->childItemWithTarget(uniqueName))
-        subItem->setDocumentState(state);
-    else
-        es.throwUninformativeAndGenericDOMException(InvalidAccessError);
+    mainItem->setDocumentState(state);
 }
 
 void Internals::setEnableMockPagePopup(bool enabled, ExceptionState& es)
 {
     Document* document = contextDocument();
     if (!document || !document->page())
         return;
     Page* page = document->page();
     if (!enabled) {
         page->chrome().client().resetPagePopupDriver();
@@ skipping 1321 matching lines @@
     return MallocStatistics::create();
 }
 
 PassRefPtr<TypeConversions> Internals::typeConversions() const
 {
     return TypeConversions::create();
 }
 
 Vector<String> Internals::getReferencedFilePaths() const
 {
-    frame()->loader().history()->saveDocumentAndScrollState();
-    return FormController::getReferencedFilePaths(frame()->loader().history()->currentItem()->documentState());
+    frame()->page()->history()->saveDocumentAndScrollState(frame());
+    return FormController::getReferencedFilePaths(frame()->page()->history()->currentItem(frame())->documentState());
 }
 
 void Internals::startTrackingRepaints(Document* document, ExceptionState& es)
 {
     if (!document || !document->view()) {
         es.throwUninformativeAndGenericDOMException(InvalidAccessError);
         return;
     }
 
     FrameView* frameView = document->view();
@@ skipping 219 matching lines @@
     }
 
     document->updateLayout();
 
     RenderView* view = document->renderView();
     if (view->compositor())
         view->compositor()->updateCompositingLayers(CompositingUpdateFinishAllDeferredWork);
 }
 
 }