| Index: public/web/WebFrame.h
|
| diff --git a/public/web/WebFrame.h b/public/web/WebFrame.h
|
| index bfd865b344941729780af9661118a7a361f80aa3..1ff4e9da391251014d1bec48bf570c22b3eb35e6 100644
|
| --- a/public/web/WebFrame.h
|
| +++ b/public/web/WebFrame.h
|
| @@ -85,8 +85,6 @@
|
|
|
| template <typename T> class WebVector;
|
|
|
| -typedef class WebFrame WebLocalFrame;
|
| -
|
| class WebFrame {
|
| public:
|
| // Control of renderTreeAsText output
|
| @@ -99,7 +97,7 @@
|
|
|
| // 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*);
|
| + BLINK_EXPORT static WebFrame* create(WebFrameClient*);
|
|
|
| // Returns the number of live WebFrame objects, used for leak checking.
|
| BLINK_EXPORT static int instanceCount();
|
| @@ -107,18 +105,16 @@
|
| // 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();
|
| + BLINK_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).
|
| - BLINK_EXPORT static WebLocalFrame* frameForContext(v8::Handle<v8::Context>);
|
| + BLINK_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.
|
| - BLINK_EXPORT static WebLocalFrame* fromFrameOwnerElement(const WebElement&);
|
| -
|
| - virtual WebLocalFrame* toWebLocalFrame() = 0;
|
| + BLINK_EXPORT static WebFrame* fromFrameOwnerElement(const WebElement&);
|
|
|
| // This method closes and deletes the WebFrame.
|
| virtual void close() = 0;
|
|
|