webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 9 insertions, 13 deletions

diff --git a/Source/WebCore/rendering/RenderRegionSet.h b/Source/WebCore/rendering/RenderRegionSet.h
index abc0ba30d..344919c15 100644
--- a/Source/WebCore/rendering/RenderRegionSet.h
+++ b/Source/WebCore/rendering/RenderRegionSet.h
@@ -13,7 +13,7 @@
  * 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,9 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
-#ifndef RenderRegionSet_h
-#define RenderRegionSet_h
+#pragma once
 
 #include "RenderRegion.h"
 #include "RenderBoxRegionInfo.h"
@@ -46,20 +44,18 @@ class RenderFlowThread;
 // FIXME: For now we derive from RenderRegion, but this may change at some point.
 
 class RenderRegionSet : public RenderRegion {
+public:
+    void expandToEncompassFlowThreadContentsIfNeeded();
+
 protected:
-    RenderRegionSet(Document&, PassRef<RenderStyle>, RenderFlowThread&);
+    RenderRegionSet(Document&, RenderStyle&&, RenderFlowThread&);
 
 private:
-    virtual void installFlowThread() override final;
-
-    virtual void expandToEncompassFlowThreadContentsIfNeeded() override final;
+    void installFlowThread() final;
 
-    virtual const char* renderName() const = 0;
+    const char* renderName() const override = 0;
     
-    virtual bool isRenderRegionSet() const override final { return true; }
+    bool isRenderRegionSet() const final { return true; }
 };
 
 } // namespace WebCore
-
-#endif // RenderRegionSet_h
-