Protect some RenderFlowThread functions.

<https://webkit.org/b/128642>

Make the RenderFlowThread constructor protected and a handful of
member functions private.

Reviewed by Anders Carlsson.

* rendering/RenderFlowThread.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@163934 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3eac8ddad532fb656b3cbfbd00f720ab9fa60833..4e1c57cdf2675e10864569966bb65463280e8534 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2014-02-11  Andreas Kling  <akling@apple.com>
+
+        Protect some RenderFlowThread functions.
+        <https://webkit.org/b/128642>
+
+        Make the RenderFlowThread constructor protected and a handful of
+        member functions private.
+
+        Reviewed by Anders Carlsson.
+
+        * rendering/RenderFlowThread.h:
+
 2014-02-11  Andreas Kling  <akling@apple.com>
 
         Don't allocate RenderNamedFlowThread's child list separately.

diff --git a/Source/WebCore/rendering/RenderFlowThread.h b/Source/WebCore/rendering/RenderFlowThread.h
index 4a2d76fe408f52e4698f69adb979d110360dfe1f..0d50d9e51178d8c43adf297bc15175800ee9b72b 100644 (file)
--- a/Source/WebCore/rendering/RenderFlowThread.h
+++ b/Source/WebCore/rendering/RenderFlowThread.h
@@ -58,17 +58,8 @@ typedef HashMap<RenderLayer*, RenderNamedFlowFragment*> LayerToRegionMap;
 
 class RenderFlowThread: public RenderBlockFlow {
 public:
-    RenderFlowThread(Document&, PassRef<RenderStyle>);
-    virtual ~RenderFlowThread() { };
-    
-    virtual bool isRenderFlowThread() const override final { return true; }
-
-    virtual void layout() override final;
+    virtual ~RenderFlowThread() { }
 
-    // Always create a RenderLayer for the RenderFlowThread so that we 
-    // can easily avoid drawing the children directly.
-    virtual bool requiresLayer() const override final { return true; }
-    
     virtual void removeFlowChildInfo(RenderObject*);
 #ifndef NDEBUG
     bool hasChildInfo(RenderObject* child) const { return child && child->isBox() && m_regionRangeMap.contains(toRenderBox(child)); }
@@ -218,7 +209,17 @@ public:
     
     bool regionInRange(const RenderRegion* targetRegion, const RenderRegion* startRegion, const RenderRegion* endRegion) const;
 
+private:
+    virtual bool isRenderFlowThread() const override final { return true; }
+    virtual void layout() override final;
+
+    // Always create a RenderLayer for the RenderFlowThread so that we
+    // can easily avoid drawing the children directly.
+    virtual bool requiresLayer() const override final { return true; }
+
 protected:
+    RenderFlowThread(Document&, PassRef<RenderStyle>);
+
     virtual const char* renderName() const = 0;
 
     // Overridden by columns/pages to set up an initial logical width of the page width even when