Merge 126839 - REGRESSION(r109480): Form state for iframe content is not restored

Source/WebCore/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 514 matching lines @@
 bool HistoryItem::hasChildren() const
 {
     return !m_children.isEmpty();
 }
 
 void HistoryItem::clearChildren()
 {
     m_children.clear();
 }
 
+bool HistoryItem::isAncestorOf(const HistoryItem* item) const
+{
+    for (size_t i = 0; i < m_children.size(); ++i) {
+        HistoryItem* child = m_children[i].get();
+        if (child == item)
+            return true;
+        if (child->isAncestorOf(item))
+            return true;
+    }
+    return false;
+}
+
 // 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();
@@ skipping 327 matching lines @@
 } // namespace WebCore
 
 #ifndef NDEBUG
 
 int showTree(const WebCore::HistoryItem* item)
 {
     return item->showTree();
 }
 
 #endif