webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 12 insertions, 21 deletions

diff --git a/Source/WebCore/rendering/RenderIFrame.h b/Source/WebCore/rendering/RenderIFrame.h
index d6478be22..8cf04cfc4 100644
--- a/Source/WebCore/rendering/RenderIFrame.h
+++ b/Source/WebCore/rendering/RenderIFrame.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,8 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef RenderIFrame_h
-#define RenderIFrame_h
+#pragma once
 
 #include "RenderFrameBase.h"
 
@@ -34,42 +33,34 @@ class RenderView;
 
 class RenderIFrame final : public RenderFrameBase {
 public:
-    RenderIFrame(HTMLIFrameElement&, PassRef<RenderStyle>);
+    RenderIFrame(HTMLIFrameElement&, RenderStyle&&);
 
     HTMLIFrameElement& iframeElement() const;
 
     bool flattenFrame() const;
-    bool isSeamless() const;
 
 private:
     void frameOwnerElement() const = delete;
 
-    virtual LayoutUnit minPreferredLogicalWidth() const override;
-    virtual LayoutUnit maxPreferredLogicalWidth() const override;
+    bool shouldComputeSizeAsReplaced() const override;
+    bool isInlineBlockOrInlineTable() const override;
 
-    virtual bool shouldComputeSizeAsReplaced() const override;
-    virtual bool isInlineBlockOrInlineTable() const override;
+    void layout() override;
 
-    virtual void layout() override;
-
-    virtual bool isRenderIFrame() const override { return true; }
+    bool isRenderIFrame() const override { return true; }
 
 #if PLATFORM(IOS)
     // FIXME: Do we still need this workaround to avoid breaking layout tests?
-    virtual const char* renderName() const override { return "RenderPartObject"; }
+    const char* renderName() const override { return "RenderPartObject"; }
 #else
-    virtual const char* renderName() const override { return "RenderIFrame"; }
+    const char* renderName() const override { return "RenderIFrame"; }
 #endif
 
-    virtual bool requiresLayer() const override;
-
-    void layoutSeamlessly();
+    bool requiresLayer() const override;
 
     RenderView* contentRootRenderer() const;
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderIFrame, isRenderIFrame())
-
 } // namespace WebCore
 
-#endif // RenderIFrame_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderIFrame, isRenderIFrame())