Make the embedder responsible for creating the WebFrame

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 58 matching lines @@
 
 template <typename T> class WebVector;
 
 // Implementation of WebFrame, note that this is a reference counted object.
 class WebFrameImpl
     : public WebFrame
     , public RefCounted<WebFrameImpl>
     , public WebCore::FrameDestructionObserver {
 public:
     // WebFrame methods:
+    virtual void close();
     virtual WebString uniqueName() const;
     virtual WebString assignedName() const;
     virtual void setName(const WebString&);
-    virtual long long identifier() const;
+    virtual long long embedderIdentifier() const;
     virtual WebVector<WebIconURL> iconURLs(int iconTypesMask) const;
     virtual WebSize scrollOffset() const;
     virtual void setScrollOffset(const WebSize&);
     virtual WebSize minimumScrollOffset() const;
     virtual WebSize maximumScrollOffset() const;
     virtual WebSize contentsSize() const;
     virtual bool hasVisibleContent() const;
     virtual WebRect visibleContentRect() const;
     virtual bool hasHorizontalScrollbar() const;
     virtual bool hasVerticalScrollbar() const;
@@ skipping 137 matching lines @@
     virtual WebString renderTreeAsText(RenderAsTextControls toShow = RenderAsTextNormal) const;
     virtual WebString markerTextForListItem(const WebElement&) const;
     virtual WebRect selectionBoundsRect() const;
 
     virtual bool selectionStartHasSpellingMarkerFor(int from, int length) const;
     virtual WebString layerTreeAsText(bool showDebugInfo = false) const;
 
     // WebCore::FrameDestructionObserver methods.
     virtual void willDetachPage();
 
-    static PassRefPtr<WebFrameImpl> create(WebFrameClient* client);
+    static WebFrameImpl* create(WebFrameClient*);
+    // FIXME: Move the embedderIdentifier concept fully to the embedder and
+    // remove this factory method.
+    static WebFrameImpl* create(WebFrameClient*, long long embedderIdentifier);
     virtual ~WebFrameImpl();
 
     // Called by the WebViewImpl to initialize the main frame for the page.
     void initializeAsMainFrame(WebCore::Page*);
 
     PassRefPtr<WebCore::Frame> createChildFrame(
         const WebCore::FrameLoadRequest&, WebCore::HTMLFrameOwnerElement*);
 
     void didChangeContentsSize(const WebCore::IntSize&);
 
@@ skipping 68 matching lines @@
     };
 
     // A bit mask specifying area of the frame to invalidate.
     enum AreaToInvalidate {
       InvalidateNothing,
       InvalidateContentArea,
       InvalidateScrollbar,   // Vertical scrollbar only.
       InvalidateAll          // Both content area and the scrollbar.
     };
 
-    explicit WebFrameImpl(WebFrameClient*);
+    WebFrameImpl(WebFrameClient*, long long frame_identifier);
 
     // Sets the local WebCore frame and registers destruction observers.
     void setWebCoreFrame(WebCore::Frame*);
 
     // Notifies the delegate about a new selection rect.
     void reportFindInPageSelection(
         const WebRect& selectionRect, int activeMatchOrdinal, int identifier);
 
     // Clear the find-in-page matches cache forcing rects to be fully
     // calculated again next time updateFindMatchRects is called.
@@ skipping 143 matching lines @@
 
     // 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_identifier;
+    long long m_embedderIdentifier;
 
     // Ensure we don't overwrite valid history data during same document loads
     // from HistoryItems
     bool m_inSameDocumentHistoryLoad;
 };
 
 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