1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderRegion.cpp b/Source/WebCore/rendering/RenderRegion.cpp
index 6f3f2e98d..87f949845 100644
--- a/Source/WebCore/rendering/RenderRegion.cpp
+++ b/Source/WebCore/rendering/RenderRegion.cpp
@@ -61,11 +61,15 @@ LayoutUnit RenderRegion::pageLogicalWidth() const
 
 LayoutUnit RenderRegion::pageLogicalHeight() const
 {
+    if (hasOverrideHeight() && view()->normalLayoutPhase())
+        return overrideLogicalContentHeight() + borderAndPaddingLogicalHeight();
     return m_flowThread->isHorizontalWritingMode() ? contentHeight() : contentWidth();
 }
 
 LayoutUnit RenderRegion::logicalHeightOfAllFlowThreadContent() const
 {
+    if (hasOverrideHeight() && view()->normalLayoutPhase())
+        return overrideLogicalContentHeight() + borderAndPaddingLogicalHeight();
     return m_flowThread->isHorizontalWritingMode() ? contentHeight() : contentWidth();
 }
 
@@ -185,8 +189,10 @@ void RenderRegion::updateRegionHasAutoLogicalHeightFlag()
     if (m_hasAutoLogicalHeight != didHaveAutoLogicalHeight) {
         if (m_hasAutoLogicalHeight)
             view()->flowThreadController()->incrementAutoLogicalHeightRegions();
-        else
+        else {
+            clearOverrideLogicalContentHeight();
             view()->flowThreadController()->decrementAutoLogicalHeightRegions();
+        }
     }
 }