diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebCore/rendering/RenderFlowThread.cpp | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebCore/rendering/RenderFlowThread.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderFlowThread.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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<RenderFlowThread>*) |