webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 11 insertions, 13 deletions

diff --git a/Source/WebCore/rendering/RenderFullScreen.h b/Source/WebCore/rendering/RenderFullScreen.h
index c8b397af1..73cd32b8e 100644
--- a/Source/WebCore/rendering/RenderFullScreen.h
+++ b/Source/WebCore/rendering/RenderFullScreen.h
@@ -22,8 +22,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RenderFullScreen_h
-#define RenderFullScreen_h
+#pragma once
 
 #if ENABLE(FULLSCREEN_API)
 
@@ -34,29 +33,28 @@ namespace WebCore {
 
 class RenderFullScreen final : public RenderFlexibleBox {
 public:
-    RenderFullScreen(Document&, PassRef<RenderStyle>);
+    RenderFullScreen(Document&, RenderStyle&&);
 
-    virtual bool isRenderFullScreen() const override { return true; }
-    virtual const char* renderName() const override { return "RenderFullScreen"; }
+    const char* renderName() const override { return "RenderFullScreen"; }
 
     void setPlaceholder(RenderBlock*);
     RenderBlock* placeholder() { return m_placeholder; }
-    void createPlaceholder(PassRef<RenderStyle>, const LayoutRect& frameRect);
+    void createPlaceholder(std::unique_ptr<RenderStyle>, const LayoutRect& frameRect);
 
     static RenderFullScreen* wrapRenderer(RenderObject*, RenderElement*, Document&);
-    void unwrapRenderer();
+    void unwrapRenderer(bool& requiresRenderTreeRebuild);
 
 private:
-    virtual void willBeDestroyed() override;
+    bool isRenderFullScreen() const override { return true; }
+    void willBeDestroyed() override;
+    bool isFlexibleBoxImpl() const override { return true; }
 
 protected:
     RenderBlock* m_placeholder;
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderFullScreen, isRenderFullScreen())
+} // namespace WebCore
 
-}
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderFullScreen, isRenderFullScreen())
 
-#endif
-
-#endif
+#endif // ENABLE(FULLSCREEN_API)