Index: public/web/WebFrame.h |
diff --git a/public/web/WebFrame.h b/public/web/WebFrame.h |
index 1f84dce8e926dadc27f53b3305567cfa244102cf..bda2d597a52889f2b06e04598db36dbf719d7690 100644 |
--- a/public/web/WebFrame.h |
+++ b/public/web/WebFrame.h |
@@ -63,6 +63,7 @@ class WebFormElement; |
class WebFrameClient; |
class WebInputElement; |
class WebLayer; |
+class WebLocalFrame; |
class WebPerformance; |
class WebPermissionClient; |
class WebRange; |
@@ -86,8 +87,12 @@ struct WebURLLoaderOptions; |
template <typename T> class WebVector; |
-typedef class WebFrame WebLocalFrame; |
- |
+// Frames may be rendered in process ('local') or out of process ('remote'). |
+// A remote frame is always cross-site; a local frame may be either same-site or |
+// cross-site. |
+// WebFrame is the base class for both WebLocalFrame and WebRemoteFrame and |
+// contains methods that are valid on both local and remote frames, such as |
+// getting a frame's parent or its opener. |
class WebFrame { |
public: |
// Control of renderTreeAsText output |
@@ -98,27 +103,9 @@ public: |
}; |
typedef unsigned RenderAsTextControls; |
- // Creates a WebFrame. Delete this WebFrame by calling WebFrame::close(). |
- // It is valid to pass a null client pointer. |
- BLINK_EXPORT static WebLocalFrame* create(WebFrameClient*); |
- |
// Returns the number of live WebFrame objects, used for leak checking. |
BLINK_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. |
- BLINK_EXPORT static WebLocalFrame* 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). |
- BLINK_EXPORT static WebLocalFrame* 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. |
- BLINK_EXPORT static WebLocalFrame* fromFrameOwnerElement(const WebElement&); |
- |
virtual WebLocalFrame* toWebLocalFrame() = 0; |
// This method closes and deletes the WebFrame. |