Respect break-inside:avoid on table rows

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

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLDialogElement.h"
 #include "core/layout/HitTestLocation.h"
 #include "core/layout/LayoutAnalyzer.h"
 #include "core/layout/LayoutFlowThread.h"
 #include "core/layout/LayoutMultiColumnFlowThread.h"
 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
 #include "core/layout/LayoutPagedFlowThread.h"
+#include "core/layout/LayoutTableRow.h"

[mstensho (USE GERRIT), 2016/02/26 13:29:59]

No need for this, I hope.

 #include "core/layout/LayoutText.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/layout/api/SelectionState.h"
 #include "core/layout/line/LineBreaker.h"
 #include "core/layout/line/LineWidth.h"
 #include "core/layout/shapes/ShapeOutsideInfo.h"
 #include "core/paint/BlockFlowPainter.h"
 #include "core/paint/ClipScope.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
@@ skipping 661 matching lines @@
 
     // Similar to how we apply clearance. Go ahead and boost height() to be the place where we're going to position the child.
     setLogicalHeight(logicalHeight() + (newLogicalTop - logicalTop));
 
     // Return the final adjusted logical top.
     return newLogicalTop;
 }
 
 static bool shouldSetStrutOnBlock(const LayoutBlockFlow& block, const RootInlineBox& lineBox, LayoutUnit lineLogicalOffset, int lineIndex, LayoutUnit pageLogicalHeight)
 {
+    LayoutUnit lineHeight = lineBox.lineBottomWithLeading() - lineBox.lineTopWithLeading();

[mstensho (USE GERRIT), 2016/02/26 13:29:59]

Maybe you meant to revert these changes, now that we return true in
allowsPaginationStrut() for table cells.

+    LayoutUnit totalLogicalHeight = lineHeight + lineLogicalOffset.clampNegativeToZero();
+
+
     bool wantsStrutOnBlock = false;
-    if (!block.style()->hasAutoOrphans() && block.style()->orphans() >= lineIndex) {
+    // We avoid letting table cells straddle a page boundary unless the cell is taller than the page.
+    if (block.isTableCell() && totalLogicalHeight <= pageLogicalHeight) {
+        wantsStrutOnBlock = true;
+    } else if (!block.style()->hasAutoOrphans() && block.style()->orphans() >= lineIndex) {
         // Not enough orphans here. Push the entire block to the next column / page as an
         // attempt to better satisfy the orphans requirement.
         wantsStrutOnBlock = true;
     } else if (lineBox == block.firstRootBox() && lineLogicalOffset == block.borderAndPaddingBefore()) {
         // This is the first line in the block. We can take the whole block with us to the next page
         // or column, rather than keeping a content-less portion of it in the previous one. Only do
         // this if the line is flush with the content edge of the block, though. If it isn't, it
         // means that the line was pushed downwards by preceding floats that didn't fit beside the
         // line, and we don't want to move all that, since it has already been established that it
         // fits nicely where it is.
-        LayoutUnit lineHeight = lineBox.lineBottomWithLeading() - lineBox.lineTopWithLeading();
-        LayoutUnit totalLogicalHeight = lineHeight + lineLogicalOffset.clampNegativeToZero();
         // It's rather pointless to break before the block if the current line isn't going to
         // fit in the same column or page, so check that as well.
         if (totalLogicalHeight <= pageLogicalHeight)
             wantsStrutOnBlock = true;
     }
     return wantsStrutOnBlock && block.allowsPaginationStrut();
 }
 
 void LayoutBlockFlow::adjustLinePositionForPagination(RootInlineBox& lineBox, LayoutUnit& delta)
 {
@@ skipping 1922 matching lines @@
     if (isOutOfFlowPositioned())
         return false;
     if (isLayoutFlowThread()) {
         // Don't let the strut escape the fragmentation context and get lost.
         // TODO(mstensho): If we're in a nested fragmentation context, we should ideally convert
         // and propagate the strut to the outer fragmentation context, so that the inner one is
         // fully pushed to the next outer fragmentainer, instead of taking up unusable space in the
         // previous one. But currently we have no mechanism in place to handle this.
         return false;
     }
+    if (isTableCell())
+        return true;
+
     LayoutBlock* containingBlock = this->containingBlock();
     return containingBlock && containingBlock->isLayoutBlockFlow();
 }
 
 void LayoutBlockFlow::setPaginationStrutPropagatedFromChild(LayoutUnit strut)
 {
     strut = std::max(strut, LayoutUnit());
     if (!m_rareData) {
         if (!strut)
             return;
@@ skipping 167 matching lines @@
     FrameView* frameView = document().view();
     LayoutUnit top = LayoutUnit((style()->position() == FixedPosition) ? 0 : frameView->scrollOffset().height());
     int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height();
     if (size().height() < visibleHeight)
         top += (visibleHeight - size().height()) / 2;
     setY(top);
     dialog->setCentered(top);
 }
 
 } // namespace blink