webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 17 deletions

diff --git a/Source/WebCore/rendering/FlowThreadController.h b/Source/WebCore/rendering/FlowThreadController.h
index e00469955..cf5cbf66f 100644
--- a/Source/WebCore/rendering/FlowThreadController.h
+++ b/Source/WebCore/rendering/FlowThreadController.h
@@ -27,12 +27,11 @@
  * SUCH DAMAGE.
  */
 
-#ifndef FlowThreadController_h
-#define FlowThreadController_h
+#pragma once
 
 #include "RenderView.h"
+#include <memory>
 #include <wtf/ListHashSet.h>
-#include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
@@ -45,12 +44,9 @@ typedef ListHashSet<RenderNamedFlowThread*> RenderNamedFlowThreadList;
 class FlowThreadController {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassOwnPtr<FlowThreadController> create(RenderView*);
+    explicit FlowThreadController(RenderView*);
     ~FlowThreadController();
 
-    RenderFlowThread* currentRenderFlowThread() const { return m_currentRenderFlowThread; }
-    void setCurrentRenderFlowThread(RenderFlowThread* flowThread) { m_currentRenderFlowThread = flowThread; }
-
     bool isRenderNamedFlowThreadOrderDirty() const { return m_isRenderNamedFlowThreadOrderDirty; }
     void setIsRenderNamedFlowThreadOrderDirty(bool dirty)
     {
@@ -67,7 +63,6 @@ public:
 
     void registerNamedFlowContentElement(Element&, RenderNamedFlowThread&);
     void unregisterNamedFlowContentElement(Element&);
-    bool isContentElementRegisteredWithAnyNamedFlow(const Element&) const;
 
     bool hasFlowThreadsWithAutoLogicalHeightRegions() const { return m_flowThreadsWithAutoLogicalHeightRegions; }
     void incrementFlowThreadsWithAutoLogicalHeightRegions() { ++m_flowThreadsWithAutoLogicalHeightRegions; }
@@ -85,28 +80,22 @@ public:
     // These layers are painted and hit-tested by RenderView
     void collectFixedPositionedLayers(Vector<RenderLayer*>& fixedPosLayers) const;
 
-#if USE(ACCELERATED_COMPOSITING)
-    void updateRenderFlowThreadLayersIfNeeded();
-#endif
+    void updateFlowThreadsLayerToRegionMappingsIfNeeded();
 
 #ifndef NDEBUG
     bool isAutoLogicalHeightRegionsCountConsistent() const;
 #endif
 
 protected:
-    explicit FlowThreadController(RenderView*);
     void updateFlowThreadsChainIfNecessary();
     void resetFlowThreadsWithAutoHeightRegions();
 
 private:
     RenderView* m_view;
-    RenderFlowThread* m_currentRenderFlowThread;
     bool m_isRenderNamedFlowThreadOrderDirty;
     unsigned m_flowThreadsWithAutoLogicalHeightRegions;
-    OwnPtr<RenderNamedFlowThreadList> m_renderNamedFlowThreadList;
+    std::unique_ptr<RenderNamedFlowThreadList> m_renderNamedFlowThreadList;
     HashMap<const Element*, RenderNamedFlowThread*> m_mapNamedFlowContentElement;
 };
 
-}
-
-#endif
+} // namespace WebCore