Ensure clean layout for all (but deprecated) functions creating VisiblePositions

third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp

 /*
  * Copyright (C) 2005 Apple Computer, 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 38 matching lines @@
 static bool isTableCellEmpty(Node* cell) {
   DCHECK(isTableCell(cell)) << cell;
   return VisiblePosition::firstPositionInNode(cell).deepEquivalent() ==
          VisiblePosition::lastPositionInNode(cell).deepEquivalent();
 }
 
 static bool isTableRowEmpty(Node* row) {
   if (!isHTMLTableRowElement(row))
     return false;
 
+  row->document().updateStyleAndLayoutIgnorePendingStylesheets();
   for (Node* child = row->firstChild(); child; child = child->nextSibling()) {
     if (isTableCell(child) && !isTableCellEmpty(child))
       return false;
   }
   return true;
 }
 
 DeleteSelectionCommand::DeleteSelectionCommand(
     Document& document,
     bool smartDelete,
@@ skipping 338 matching lines @@
   bool isBROnLineByItself = upstreamStartIsBR && downstreamStartIsBR &&
                             nodeAfterDownstreamStart == nodeAfterUpstreamEnd;
   if (isBROnLineByItself) {
     removeNode(nodeAfterDownstreamStart, editingState);
     return true;
   }
 
   // FIXME: This code doesn't belong in here.
   // We detect the case where the start is an empty line consisting of BR not
   // wrapped in a block element.
-  if (upstreamStartIsBR && downstreamStartIsBR &&
-      !(isStartOfBlock(VisiblePosition::beforeNode(nodeAfterUpstreamStart)) &&
-        isEndOfBlock(VisiblePosition::afterNode(nodeAfterUpstreamStart)))) {
-    m_startsAtEmptyLine = true;
-    m_endingPosition = m_downstreamEnd;
+  if (upstreamStartIsBR && downstreamStartIsBR) {
+    document().updateStyleAndLayoutIgnorePendingStylesheets();

[yosin_UTC9, 2016/10/13 06:26:46]

Wow, we has been updating layout in if-condition!

+    if (!(isStartOfBlock(VisiblePosition::beforeNode(nodeAfterUpstreamStart)) &&
+          isEndOfBlock(VisiblePosition::afterNode(nodeAfterUpstreamStart)))) {
+      m_startsAtEmptyLine = true;
+      m_endingPosition = m_downstreamEnd;
+    }
   }
 
   return false;
 }
 
 static Position firstEditablePositionInNode(Node* node) {
   DCHECK(node);
   Node* next = node;
   while (next && !hasEditableStyle(*next))
     next = NodeTraversal::next(*next, node);
@@ skipping 51 matching lines @@
     document().updateStyleAndLayoutIgnorePendingStylesheets();
     LayoutObject* r = node->layoutObject();
     if (r && r->isTableCell() && toLayoutTableCell(r)->contentHeight() <= 0) {
       Position firstEditablePosition = firstEditablePositionInNode(node);
       if (firstEditablePosition.isNotNull())
         insertBlockPlaceholder(firstEditablePosition, editingState);
     }
     return;
   }
 
+  document().updateStyleAndLayoutIgnorePendingStylesheets();
   if (node == m_startBlock) {
     VisiblePosition previous = previousPositionOf(
         VisiblePosition::firstPositionInNode(m_startBlock.get()));
     if (previous.isNotNull() && !isEndOfBlock(previous))
       m_needPlaceholder = true;
   }
   if (node == m_endBlock) {
     VisiblePosition next =
         nextPositionOf(VisiblePosition::lastPositionInNode(m_endBlock.get()));
     if (next.isNotNull() && !isStartOfBlock(next))
@@ skipping 701 matching lines @@
   visitor->trace(m_deleteIntoBlockquoteStyle);
   visitor->trace(m_startRoot);
   visitor->trace(m_endRoot);
   visitor->trace(m_startTableRow);
   visitor->trace(m_endTableRow);
   visitor->trace(m_temporaryPlaceholder);
   CompositeEditCommand::trace(visitor);
 }
 
 }  // namespace blink