Add a unique frame id and save it on HistoryItem.

Source/core/frame/Frame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 82 matching lines @@
 }
 
 static inline float parentTextZoomFactor(Frame* frame)
 {
     Frame* parent = frame->tree().parent();
     if (!parent)
         return 1;
     return parent->textZoomFactor();
 }
 
-inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* frameLoaderClient)
-    : m_page(page)
-    , m_treeNode(this, parentFromOwnerElement(ownerElement))
-    , m_loader(this, frameLoaderClient)
+inline Frame::Frame(PassRefPtr<FrameInit> frameInit)
+    : m_page(frameInit->page())
+    , m_treeNode(this, parentFromOwnerElement(frameInit->ownerElement()))
+    , m_loader(this, frameInit->frameLoaderClient())
     , m_navigationScheduler(this)
-    , m_ownerElement(ownerElement)
     , m_script(adoptPtr(new ScriptController(this)))
     , m_editor(Editor::create(*this))
     , m_spellChecker(SpellChecker::create(*this))
     , m_selection(adoptPtr(new FrameSelection(this)))
     , m_eventHandler(adoptPtr(new EventHandler(this)))
     , m_animationController(adoptPtr(new AnimationController(this)))
     , m_inputMethodController(InputMethodController::create(*this))
+    , m_frameInit(frameInit)
     , m_pageZoomFactor(parentPageZoomFactor(this))
     , m_textZoomFactor(parentTextZoomFactor(this))
 #if ENABLE(ORIENTATION_EVENTS)
     , m_orientation(0)
 #endif
     , m_inViewSourceMode(false)
 {
-    ASSERT(page);
+    ASSERT(m_page);
 
-    if (ownerElement) {
-        page->incrementSubframeCount();
-        ownerElement->setContentFrame(*this);
+    if (ownerElement()) {
+        m_page->incrementSubframeCount();
+        ownerElement()->setContentFrame(*this);
     }
 
 #ifndef NDEBUG
     frameCounter.increment();
 #endif
 }
 
-PassRefPtr<Frame> Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* client)
+PassRefPtr<Frame> Frame::create(PassRefPtr<FrameInit> frameInit)
 {
-    RefPtr<Frame> frame = adoptRef(new Frame(page, ownerElement, client));
-    if (!ownerElement)
-        page->setMainFrame(frame);
+    RefPtr<Frame> frame = adoptRef(new Frame(frameInit));
+    if (!frame->ownerElement())
+        frame->page()->setMainFrame(frame);
     InspectorInstrumentation::frameAttachedToParent(frame.get());
     return frame.release();
 }
 
 Frame::~Frame()
 {
     setView(0);
     loader().clear(ClearScriptObjects | ClearWindowObject);
 
     // FIXME: We should not be doing all this work inside the destructor
@@ skipping 132 matching lines @@
     return m_domWindow ? m_domWindow->document() : 0;
 }
 
 RenderView* Frame::contentRenderer() const
 {
     return document() ? document()->renderView() : 0;
 }
 
 RenderPart* Frame::ownerRenderer() const
 {
-    HTMLFrameOwnerElement* ownerElement = m_ownerElement;
-    if (!ownerElement)
+    if (!ownerElement())
         return 0;
-    RenderObject* object = ownerElement->renderer();
+    RenderObject* object = ownerElement()->renderer();
     if (!object)
         return 0;
     // FIXME: If <object> is ever fixed to disassociate itself from frames
     // that it has started but canceled, then this can turn into an ASSERT
-    // since m_ownerElement would be 0 when the load is canceled.
+    // since ownerElement() would be 0 when the load is canceled.
     // https://bugs.webkit.org/show_bug.cgi?id=18585
     if (!object->isRenderPart())
         return 0;
     return toRenderPart(object);
 }
 
 void Frame::dispatchVisibilityStateChangeEvent()
 {
     if (document())
         document()->dispatchVisibilityStateChangeEvent();
@@ skipping 31 matching lines @@
 
 void Frame::detachFromPage()
 {
     // We should never be detatching the page during a Layout.
     RELEASE_ASSERT(!m_view || !m_view->isInLayout());
     m_page = 0;
 }
 
 void Frame::disconnectOwnerElement()
 {
-    if (m_ownerElement) {
+    if (ownerElement()) {
         if (Document* doc = document())
             doc->topDocument()->clearAXObjectCache();
-        m_ownerElement->clearContentFrame();
+        ownerElement()->clearContentFrame();
         if (m_page)
             m_page->decrementSubframeCount();
     }
-    m_ownerElement = 0;
+    m_frameInit->setOwnerElement(0);
 }
 
 String Frame::documentTypeString() const
 {
     if (DocumentType* doctype = document()->doctype())
         return createMarkup(doctype);
 
     return String();
 }
 
@@ skipping 307 matching lines @@
     if (!m_page)
         return 0;
 
     double ratio = m_page->deviceScaleFactor();
     if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())
         ratio *= pageZoomFactor();
     return ratio;
 }
 
 } // namespace WebCore