Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)

1 files changed, 18 insertions, 6 deletions

diff --git a/Source/WebCore/rendering/RenderIFrame.h b/Source/WebCore/rendering/RenderIFrame.h
index fe6631e36..8b93407e3 100644
--- a/Source/WebCore/rendering/RenderIFrame.h
+++ b/Source/WebCore/rendering/RenderIFrame.h
@@ -30,22 +30,34 @@
 
 namespace WebCore {
 
+class RenderView;
+
 class RenderIFrame : public RenderFrameBase {
 public:
     explicit RenderIFrame(Element*);
 
-    bool flattenFrame();
+    bool flattenFrame() const;
+    bool isSeamless() const;
 
 private:
-    virtual void computeLogicalHeight();
-    virtual void computeLogicalWidth();
+    virtual void computeLogicalHeight() OVERRIDE;
+    virtual void computeLogicalWidth() OVERRIDE;
+
+    virtual LayoutUnit minPreferredLogicalWidth() const OVERRIDE;
+    virtual LayoutUnit maxPreferredLogicalWidth() const OVERRIDE;
+
+    virtual bool shouldComputeSizeAsReplaced() const OVERRIDE;
+    virtual bool isInlineBlockOrInlineTable() const OVERRIDE;
+
+    virtual void layout() OVERRIDE;
 
-    virtual void layout();
+    virtual bool isRenderIFrame() const OVERRIDE { return true; }
 
-    virtual bool isRenderIFrame() const { return true; }
+    virtual const char* renderName() const OVERRIDE { return "RenderPartObject"; } // Lying for now to avoid breaking tests
 
-    virtual const char* renderName() const { return "RenderPartObject"; } // Lying for now to avoid breaking tests
+    void layoutSeamlessly();
 
+    RenderView* contentRootRenderer() const;
 };
 
 inline RenderIFrame* toRenderIFrame(RenderObject* object)