Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / frame / Frame.h

diff --git a/src/third_party/WebKit/Source/core/frame/Frame.h b/src/third_party/WebKit/Source/core/frame/Frame.h
index a4b404a..8eda83f 100644 (file)
--- a/src/third_party/WebKit/Source/core/frame/Frame.h
+++ b/src/third_party/WebKit/Source/core/frame/Frame.h
@@ -28,7 +28,7 @@
 #ifndef Frame_h
 #define Frame_h
 
-#include "heap/Handle.h"
+#include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/HashSet.h"
 #include "wtf/RefCounted.h"
@@ -39,14 +39,13 @@ class WebLayer;
 
 namespace WebCore {
 
-class Document;
 class DOMWindow;
 class ChromeClient;
 class FrameDestructionObserver;
 class FrameHost;
 class HTMLFrameOwnerElement;
 class Page;
-class RenderView;
+class RenderPart;
 class Settings;
 
 class Frame : public RefCounted<Frame> {
@@ -70,15 +69,18 @@ public:
 
     bool isMainFrame() const;
 
+    virtual void disconnectOwnerElement();
+
+    HTMLFrameOwnerElement* ownerElement() const;
+
     // FIXME: DOMWindow and Document should both be moved to LocalFrame
     // after RemoteFrame is complete enough to exist without them.
     virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>);
     DOMWindow* domWindow() const;
-    Document* document() const;
 
     ChromeClient& chromeClient() const;
 
-    RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.
+    RenderPart* ownerRenderer() const; // Renderer for the element that contains this frame.
 
     int64_t frameID() const { return m_frameID; }
 
@@ -88,6 +90,12 @@ public:
 
     Settings* settings() const; // can be null
 
+    // FIXME: This method identifies a LocalFrame that is acting as a RemoteFrame.
+    // It is necessary only until we can instantiate a RemoteFrame, at which point
+    // it can be removed and its callers can be converted to use the isRemoteFrame()
+    // method.
+    bool isRemoteFrameTemporary() const { return m_remotePlatformLayer; }
+
 protected:
     Frame(FrameHost*, HTMLFrameOwnerElement*);
 
@@ -110,6 +118,12 @@ inline DOMWindow* Frame::domWindow() const
 {
     return m_domWindow.get();
 }
+
+inline HTMLFrameOwnerElement* Frame::ownerElement() const
+{
+    return m_ownerElement;
+}
+
 } // namespace WebCore
 
 #endif // Frame_h