No longer store page logical height in LayoutState.

third_party/WebKit/Source/core/layout/LayoutState.cpp

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  */
 
 #include "core/layout/LayoutState.h"
 
 #include "core/layout/LayoutFlowThread.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutView.h"
 
 namespace blink {
 
-LayoutState::LayoutState(LayoutUnit pageLogicalHeight,
-                         LayoutView& view)
-    : m_isPaginated(pageLogicalHeight),
+LayoutState::LayoutState(LayoutView& view)
+    : m_isPaginated(view.pageLogicalHeight()),
       m_containingBlockLogicalWidthChanged(false),
       m_paginationStateChanged(false),
       m_flowThread(nullptr),
       m_next(nullptr),
-      m_pageLogicalHeight(pageLogicalHeight),
       m_layoutObject(view) {
   ASSERT(!view.layoutState());
   view.pushLayoutState(*this);
 }
 
 LayoutState::LayoutState(LayoutBox& layoutObject,
-                         LayoutUnit pageLogicalHeight,
                          bool containingBlockLogicalWidthChanged)
     : m_containingBlockLogicalWidthChanged(containingBlockLogicalWidthChanged),
       m_next(layoutObject.view()->layoutState()),
       m_layoutObject(layoutObject) {
   if (layoutObject.isLayoutFlowThread())
     m_flowThread = toLayoutFlowThread(&layoutObject);
   else
     m_flowThread = m_next->flowThread();
   m_paginationStateChanged = m_next->m_paginationStateChanged;
   layoutObject.view()->pushLayoutState(*this);
   m_heightOffsetForTableHeaders = m_next->heightOffsetForTableHeaders();
 
-  if (pageLogicalHeight || layoutObject.isLayoutFlowThread()) {
+  if (layoutObject.isLayoutFlowThread()) {
     // Entering a new pagination context.
-    m_pageLogicalHeight = pageLogicalHeight;
     m_paginationOffset = LayoutSize();
     m_isPaginated = true;
     return;
   }
 
   // Disable pagination for objects we don't support. For now this includes
   // overflow:scroll/auto, inline blocks and writing mode roots. Additionally,
   // pagination inside SVG is not allowed.
   if (layoutObject.getPaginationBreakability() == LayoutBox::ForbidBreaks ||
       (m_layoutObject.isSVG() && !m_layoutObject.isSVGRoot())) {
     m_flowThread = nullptr;
-    m_pageLogicalHeight = LayoutUnit();
     m_isPaginated = false;
     return;
   }
 
-  // Propagate the old page height and offset down.
-  m_pageLogicalHeight = m_next->m_pageLogicalHeight;
-
-  m_isPaginated = m_pageLogicalHeight || m_flowThread;
+  m_isPaginated = m_next->m_isPaginated;
   if (!m_isPaginated)
     return;
 
   // Now adjust the pagination offset, so that we can easily figure out how far
   // away we are from the start of the pagination context.
   m_paginationOffset = m_next->m_paginationOffset;
   bool fixed = layoutObject.isOutOfFlowPositioned() &&
                layoutObject.style()->position() == FixedPosition;
   if (fixed)
     return;
@@ skipping 38 matching lines @@
 
 LayoutUnit LayoutState::pageLogicalOffset(
     const LayoutBox& child,
     const LayoutUnit& childLogicalOffset) const {
   if (child.isHorizontalWritingMode())
     return m_paginationOffset.height() + childLogicalOffset;
   return m_paginationOffset.width() + childLogicalOffset;
 }
 
 }  // namespace blink