Split the frame tree logic out of HistoryItem

Source/core/history/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
@@ skipping 32 matching lines @@
     // Initialize to the current time to reduce the likelihood of generating
     // identifiers that overlap with those from past/future browser sessions.
     static long long next = static_cast<long long>(currentTime() * 1000000.0);
     return ++next;
 }
 
 HistoryItem::HistoryItem()
     : m_pageScaleFactor(0)
     , m_itemSequenceNumber(generateSequenceNumber())
     , m_documentSequenceNumber(generateSequenceNumber())
+    , m_targetFrameID(0)
 {
 }
 
 HistoryItem::~HistoryItem()
 {
 }
 
 inline HistoryItem::HistoryItem(const HistoryItem& item)
     : RefCounted<HistoryItem>()
     , m_urlString(item.m_urlString)
     , m_originalURLString(item.m_originalURLString)
     , m_referrer(item.m_referrer)
     , m_target(item.m_target)
     , m_scrollPoint(item.m_scrollPoint)
     , m_pageScaleFactor(item.m_pageScaleFactor)
+    , m_documentState(item.m_documentState)
     , m_itemSequenceNumber(item.m_itemSequenceNumber)
     , m_documentSequenceNumber(item.m_documentSequenceNumber)
+    , m_targetFrameID(item.m_targetFrameID)
+    , m_stateObject(item.m_stateObject)
     , m_formContentType(item.m_formContentType)
 {
     if (item.m_formData)
         m_formData = item.m_formData->copy();
 
     unsigned size = item.m_children.size();
     m_children.reserveInitialCapacity(size);
     for (unsigned i = 0; i < size; ++i)
         m_children.uncheckedAppend(item.m_children[i]->copy());
 }
 
 PassRefPtr<HistoryItem> HistoryItem::copy() const
 {
     return adoptRef(new HistoryItem(*this));
 }
 
 void HistoryItem::reset()
 {
     m_urlString = String();
     m_originalURLString = String();
     m_referrer = String();
     m_target = String();
     m_itemSequenceNumber = generateSequenceNumber();
     m_stateObject = 0;
     m_documentSequenceNumber = generateSequenceNumber();
+    m_targetFrameID = 0;
     m_formData = 0;
     m_formContentType = String();
     clearChildren();
 }
 
 const String& HistoryItem::urlString() const
 {
     return m_urlString;
 }
 
@@ skipping 92 matching lines @@
     m_documentState.clear();
 }
 
 void HistoryItem::setStateObject(PassRefPtr<SerializedScriptValue> object)
 {
     m_stateObject = object;
 }
 
 void HistoryItem::addChildItem(PassRefPtr<HistoryItem> child)
 {
-    ASSERT(!childItemWithTarget(child->target()));
     m_children.append(child);
 }
 
-void HistoryItem::setChildItem(PassRefPtr<HistoryItem> child)
-{
-    unsigned size = m_children.size();
-    for (unsigned i = 0; i < size; ++i)  {
-        if (m_children[i]->target() == child->target()) {
-            m_children[i] = child;
-            return;
-        }
-    }
-    m_children.append(child);
-}
-
-HistoryItem* HistoryItem::childItemWithTarget(const String& target) const
-{
-    unsigned size = m_children.size();
-    for (unsigned i = 0; i < size; ++i) {
-        if (m_children[i]->target() == target)
-            return m_children[i].get();
-    }
-    return 0;
-}
-
-HistoryItem* HistoryItem::childItemWithDocumentSequenceNumber(long long number) const
-{
-    unsigned size = m_children.size();
-    for (unsigned i = 0; i < size; ++i) {
-        if (m_children[i]->documentSequenceNumber() == number)
-            return m_children[i].get();
-    }
-    return 0;
-}
-
 const HistoryItemVector& HistoryItem::children() const
 {
     return m_children;
 }
 
 void HistoryItem::clearChildren()
 {
     m_children.clear();
 }
 
-// We do same-document navigation if going to a different item and if either of the following is true:
-// - The other item corresponds to the same document (for history entries created via pushState or fragment changes).
-// - The other item corresponds to the same set of documents, including frames (for history entries created via regular navigation)
-bool HistoryItem::shouldDoSameDocumentNavigationTo(HistoryItem* otherItem) const
-{
-    if (this == otherItem)
-        return false;
-
-    if (stateObject() || otherItem->stateObject())
-        return documentSequenceNumber() == otherItem->documentSequenceNumber();
-
-    if ((url().hasFragmentIdentifier() || otherItem->url().hasFragmentIdentifier()) && equalIgnoringFragmentIdentifier(url(), otherItem->url()))
-        return documentSequenceNumber() == otherItem->documentSequenceNumber();
-
-    return hasSameDocumentTree(otherItem);
-}
-
-// Does a recursive check that this item and its descendants have the same
-// document sequence numbers as the other item.
-bool HistoryItem::hasSameDocumentTree(HistoryItem* otherItem) const
-{
-    if (documentSequenceNumber() != otherItem->documentSequenceNumber())
-        return false;
-
-    if (children().size() != otherItem->children().size())
-        return false;
-
-    for (size_t i = 0; i < children().size(); i++) {
-        HistoryItem* child = children()[i].get();
-        HistoryItem* otherChild = otherItem->childItemWithDocumentSequenceNumber(child->documentSequenceNumber());
-        if (!otherChild || !child->hasSameDocumentTree(otherChild))
-            return false;
-    }
-
-    return true;
-}
-
-// Does a non-recursive check that this item and its immediate children have the
-// same frames as the other item.
-bool HistoryItem::hasSameFrames(HistoryItem* otherItem) const
-{
-    if (target() != otherItem->target())
-        return false;
-
-    if (children().size() != otherItem->children().size())
-        return false;
-
-    for (size_t i = 0; i < children().size(); i++) {
-        if (!otherItem->childItemWithTarget(children()[i]->target()))
-            return false;
-    }
-
-    return true;
-}
-
 String HistoryItem::formContentType() const
 {
     return m_formContentType;
 }
 
 void HistoryItem::setFormInfoFromRequest(const ResourceRequest& request)
 {
     m_referrer = request.httpReferrer();
 
     if (equalIgnoringCase(request.httpMethod(), "POST")) {
@@ skipping 21 matching lines @@
 {
     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());
 }
 
-#ifndef NDEBUG
-
-int HistoryItem::showTree() const
-{
-    return showTreeWithIndent(0);
-}
-
-int HistoryItem::showTreeWithIndent(unsigned indentLevel) const
-{
-    Vector<char> prefix;
-    for (unsigned i = 0; i < indentLevel; ++i)
-        prefix.append("  ", 2);
-    prefix.append("\0", 1);
-
-    fprintf(stderr, "%s+-%s (%p)\n", prefix.data(), m_urlString.utf8().data(), this);
-
-    int totalSubItems = 0;
-    for (unsigned i = 0; i < m_children.size(); ++i)
-        totalSubItems += m_children[i]->showTreeWithIndent(indentLevel + 1);
-    return totalSubItems + 1;
-}
-
-#endif
-
 } // namespace WebCore
 
-#ifndef NDEBUG
-
-int showTree(const WebCore::HistoryItem* item)
-{
-    return item->showTree();
-}
-
-#endif