Make the embedder responsible for creating the WebFrame

public/web/WebFrame.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 41 matching lines @@
 template <class T> class Local;
 }
 
 namespace WebKit {
 
 class WebData;
 class WebDataSource;
 class WebDocument;
 class WebElement;
 class WebFormElement;
+class WebFrameClient;
 class WebHistoryItem;
 class WebInputElement;
 class WebPerformance;
 class WebRange;
 class WebSecurityOrigin;
 class WebString;
 class WebURL;
 class WebURLLoader;
 class WebURLRequest;
 class WebView;
@@ skipping 13 matching lines @@
 class WebFrame {
 public:
     // Control of renderTreeAsText output
     enum RenderAsTextControl {
         RenderAsTextNormal = 0,
         RenderAsTextDebug = 1 << 0,
         RenderAsTextPrinting = 1 << 1
     };
     typedef unsigned RenderAsTextControls;
 
+    // Creates a WebFrame. Delete this WebFrame by calling WebFrame::close().
+    // It is valid to pass a null client pointer.
+    WEBKIT_EXPORT static WebFrame* create(WebFrameClient*);
+
+    // Same as create(WebFrameClient*) except the embedder may explicitly pass
+    // in the identifier for the WebFrame. This can be used with
+    // generateEmbedderIdentifier() if constructing the WebFrameClient for this
+    // frame requires the identifier.
+    //
+    // FIXME: Move the embedderIdentifier concept fully to the embedder and
+    // remove this factory method.
+    WEBKIT_EXPORT static WebFrame* create(WebFrameClient*, long long embedderIdentifier);
+
+    // Generates an identifier suitable for use with create() above.
+    // Never returns -1.
+    WEBKIT_EXPORT static long long generateEmbedderIdentifier();
+
     // Returns the number of live WebFrame objects, used for leak checking.
     WEBKIT_EXPORT static int instanceCount();
 
     // Returns the WebFrame associated with the current V8 context. This
     // function can return 0 if the context is associated with a Document that
     // is not currently being displayed in a Frame.
     WEBKIT_EXPORT static WebFrame* frameForCurrentContext();
 
     // Returns the frame corresponding to the given context. This can return 0
     // if the context is detached from the frame, or if the context doesn't
     // correspond to a frame (e.g., workers).
     WEBKIT_EXPORT static WebFrame* frameForContext(v8::Handle<v8::Context>);
 
     // Returns the frame inside a given frame or iframe element. Returns 0 if
     // the given element is not a frame, iframe or if the frame is empty.
     WEBKIT_EXPORT static WebFrame* fromFrameOwnerElement(const WebElement&);
 
+    // This method closes and deletes the WebFrame.
+    virtual void close() = 0;
+
 
     // Basic properties ---------------------------------------------------
 
     // The unique name of this frame.
     virtual WebString uniqueName() const = 0;
 
     // The name of this frame. If no name is given, empty string is returned.
     virtual WebString assignedName() const = 0;
 
     // Sets the name of this frame. For child frames (frames that are not a
     // top-most frame) the actual name may have a suffix appended to make the
     // frame name unique within the hierarchy.
     virtual void setName(const WebString&) = 0;
 
     // A globally unique identifier for this frame.
-    virtual long long identifier() const = 0;
+    // FIXME: Convert users to embedderIdentifier() and remove identifier().
+    long long identifier() const { return embedderIdentifier(); }
+    virtual long long embedderIdentifier() const = 0;
 
     // The urls of the given combination types of favicon (if any) specified by
     // the document loaded in this frame. The iconTypesMask is a bit-mask of
     // WebIconURL::Type values, used to select from the available set of icon
     // URLs
     virtual WebVector<WebIconURL> iconURLs(int iconTypesMask) const = 0;
 
 
     // Geometry -----------------------------------------------------------
 
@@ skipping 512 matching lines @@
     // text form. This is used only by layout tests.
     virtual WebString layerTreeAsText(bool showDebugInfo = false) const = 0;
 
 protected:
     ~WebFrame() { }
 };
 
 } // namespace WebKit
 
 #endif