webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 12 insertions, 4 deletions

diff --git a/Source/WebCore/rendering/FlowThreadController.h b/Source/WebCore/rendering/FlowThreadController.h
index fd6e621d0..e00469955 100644
--- a/Source/WebCore/rendering/FlowThreadController.h
+++ b/Source/WebCore/rendering/FlowThreadController.h
@@ -31,8 +31,8 @@
 #define FlowThreadController_h
 
 #include "RenderView.h"
-#include <memory>
 #include <wtf/ListHashSet.h>
+#include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
@@ -45,9 +45,12 @@ typedef ListHashSet<RenderNamedFlowThread*> RenderNamedFlowThreadList;
 class FlowThreadController {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    explicit FlowThreadController(RenderView*);
+    static PassOwnPtr<FlowThreadController> create(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)
     {
@@ -64,6 +67,7 @@ public:
 
     void registerNamedFlowContentElement(Element&, RenderNamedFlowThread&);
     void unregisterNamedFlowContentElement(Element&);
+    bool isContentElementRegisteredWithAnyNamedFlow(const Element&) const;
 
     bool hasFlowThreadsWithAutoLogicalHeightRegions() const { return m_flowThreadsWithAutoLogicalHeightRegions; }
     void incrementFlowThreadsWithAutoLogicalHeightRegions() { ++m_flowThreadsWithAutoLogicalHeightRegions; }
@@ -81,21 +85,25 @@ public:
     // These layers are painted and hit-tested by RenderView
     void collectFixedPositionedLayers(Vector<RenderLayer*>& fixedPosLayers) const;
 
-    void updateFlowThreadsLayerToRegionMappingsIfNeeded();
+#if USE(ACCELERATED_COMPOSITING)
+    void updateRenderFlowThreadLayersIfNeeded();
+#endif
 
 #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;
-    std::unique_ptr<RenderNamedFlowThreadList> m_renderNamedFlowThreadList;
+    OwnPtr<RenderNamedFlowThreadList> m_renderNamedFlowThreadList;
     HashMap<const Element*, RenderNamedFlowThread*> m_mapNamedFlowContentElement;
 };