Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)

New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream

1 files changed, 20 insertions, 0 deletions

diff --git a/Source/WebCore/rendering/RenderNamedFlowThread.cpp b/Source/WebCore/rendering/RenderNamedFlowThread.cpp
index 227af7df5..5b02453e4 100644
--- a/Source/WebCore/rendering/RenderNamedFlowThread.cpp
+++ b/Source/WebCore/rendering/RenderNamedFlowThread.cpp
@@ -36,6 +36,7 @@ namespace WebCore {
 RenderNamedFlowThread::RenderNamedFlowThread(Node* node, PassRefPtr<WebKitNamedFlow> namedFlow)
     : RenderFlowThread(node)
     , m_namedFlow(namedFlow)
+    , m_regionLayoutUpdateEventTimer(this, &RenderNamedFlowThread::regionLayoutUpdateEventTimerFired)
 {
     m_namedFlow->setRenderer(this);
 }
@@ -192,6 +193,10 @@ void RenderNamedFlowThread::removeRegionFromThread(RenderRegion* renderRegion)
         return;
     }
 
+    // After removing all the regions in the flow the following layout needs to dispatch the regionLayoutUpdate event
+    if (m_regionList.isEmpty())
+        setDispatchRegionLayoutUpdateEvent(true);
+
     invalidateRegions();
 }
 
@@ -301,4 +306,19 @@ void RenderNamedFlowThread::willBeDestroyed()
     RenderFlowThread::willBeDestroyed();
 }
 
+void RenderNamedFlowThread::dispatchRegionLayoutUpdateEvent()
+{
+    RenderFlowThread::dispatchRegionLayoutUpdateEvent();
+
+    if (!m_regionLayoutUpdateEventTimer.isActive() && m_namedFlow->hasEventListeners())
+        m_regionLayoutUpdateEventTimer.startOneShot(0);
+}
+
+void RenderNamedFlowThread::regionLayoutUpdateEventTimerFired(Timer<RenderNamedFlowThread>*)
+{
+    ASSERT(m_namedFlow);
+
+    m_namedFlow->dispatchRegionLayoutUpdateEvent();
+}
+
 }