Add a unique frame id and save it on HistoryItem.

Source/web/WebFrameImpl.h

 /*
  * Copyright (C) 2009 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 396 matching lines @@
         const WebFindOptions&, bool reset);
 
     // Determines whether to invalidate the content area and scrollbar.
     void invalidateIfNecessary();
 
     void loadJavaScriptURL(const WebCore::KURL&);
 
     // Returns a hit-tested VisiblePosition for the given point
     WebCore::VisiblePosition visiblePositionForWindowPoint(const WebPoint&);
 
-    FrameLoaderClientImpl m_frameLoaderClient;
+    class WebFrameInit : public WebCore::FrameInit {
+    public:
+        static PassRefPtr<WebFrameInit> create(WebFrameImpl* webFrameImpl, int64_t frameID)
+        {
+            return adoptRef(new WebFrameInit(webFrameImpl, frameID));
+        }
+
+    private:
+        WebFrameInit(WebFrameImpl* webFrameImpl, int64_t frameID)
+            : WebCore::FrameInit(frameID)
+            , m_frameLoaderClientImpl(webFrameImpl)
+        {
+            setFrameLoaderClient(&m_frameLoaderClientImpl);
+        }
+
+        FrameLoaderClientImpl m_frameLoaderClientImpl;
+    };
+    RefPtr<WebFrameInit> m_frameInit;
 
     WebFrameClient* m_client;
 
     // A way for the main frame to keep track of which frame has an active
     // match. Should be 0 for all other frames.
     WebFrameImpl* m_currentActiveMatchFrame;
 
     // The range of the active match for the current frame.
     RefPtr<WebCore::Range> m_activeMatch;
 
@@ skipping 60 matching lines @@
     bool m_findMatchRectsAreValid;
 
     // Contents size when find-in-page match rects were last computed for this
     // frame's cache.
     WebCore::IntSize m_contentsSizeForCurrentFindMatchRects;
 
     // Valid between calls to BeginPrint() and EndPrint(). Containts the print
     // information. Is used by PrintPage().
     OwnPtr<ChromePrintContext> m_printContext;
 
-    // The identifier of this frame.
-    long long m_embedderIdentifier;
-
     // Ensure we don't overwrite valid history data during same document loads
     // from HistoryItems
     bool m_inSameDocumentHistoryLoad;
 
     // Stores the additional input evetns scale when device metrics emulation is enabled.
     float m_inputEventsScaleFactorForEmulation;
 };
 
 inline WebFrameImpl* toWebFrameImpl(WebFrame* webFrame)
 {
     return static_cast<WebFrameImpl*>(webFrame);
 }
 
 inline const WebFrameImpl* toWebFrameImpl(const WebFrame* webFrame)
 {
     return static_cast<const WebFrameImpl*>(webFrame);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toWebFrameImpl(const WebFrameImpl*);
 
 } // namespace WebKit
 
 #endif