From 49233e234e5c787396cadb2cea33b31ae0cd65c1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 20 Jun 2012 13:01:08 +0200 Subject: Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813) New snapshot with Windows build fixes --- Source/WebCore/rendering/RenderFlowThread.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/rendering/RenderFlowThread.cpp') diff --git a/Source/WebCore/rendering/RenderFlowThread.cpp b/Source/WebCore/rendering/RenderFlowThread.cpp index 507d3b395..fdc2e6bff 100644 --- a/Source/WebCore/rendering/RenderFlowThread.cpp +++ b/Source/WebCore/rendering/RenderFlowThread.cpp @@ -51,7 +51,7 @@ RenderFlowThread::RenderFlowThread(Node* node) , m_regionsInvalidated(false) , m_regionsHaveUniformLogicalWidth(true) , m_regionsHaveUniformLogicalHeight(true) - , m_overset(false) + , m_overset(true) , m_regionLayoutUpdateEventTimer(this, &RenderFlowThread::regionLayoutUpdateEventTimerFired) { ASSERT(node->document()->cssRegionsEnabled()); @@ -717,9 +717,10 @@ void RenderFlowThread::computeOverflowStateForRegions(LayoutUnit oldClientAfterE region->setDispatchRegionLayoutUpdateEvent(true); } - // With the regions overflow state computed we can also set the overflow for the named flow. + // With the regions overflow state computed we can also set the overset flag for the named flow. + // If there are no valid regions in the chain, overset is true RenderRegion* lastReg = lastRegion(); - m_overset = lastReg && (lastReg->regionState() == RenderRegion::RegionOverflow); + m_overset = lastReg ? lastReg->regionState() == RenderRegion::RegionOverflow : true; } void RenderFlowThread::regionLayoutUpdateEventTimerFired(Timer*) -- cgit v1.2.1