Update layout in CompositeEditCommand::moveParagraphs for TextIterator::rangeLength

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

 /*
  * Copyright (C) 2005, 2006, 2007, 2008 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 1611 matching lines @@
       createVisiblePositionDeprecated(afterParagraphPosition.position());
   if (beforeParagraph.isNotNull() &&
       (!isEndOfParagraphDeprecated(beforeParagraph) ||
        beforeParagraph.deepEquivalent() == afterParagraph.deepEquivalent())) {
     // FIXME: Trim text between beforeParagraph and afterParagraph if they
     // aren't equal.
     insertNodeAt(HTMLBRElement::create(document()),
                  beforeParagraph.deepEquivalent(), editingState);
     if (editingState->isAborted())
       return;
-    // Need an updateLayout here in case inserting the br has split a text node.
-    document().updateStyleAndLayoutIgnorePendingStylesheets();
   }
 
+  // TextIterator::rangeLength requires clean layout.
+  document().updateStyleAndLayoutIgnorePendingStylesheets();
+
   destinationIndex = TextIterator::rangeLength(
       Position::firstPositionInNode(document().documentElement()),
       destination.toParentAnchoredPosition(), true);
 
   VisibleSelection destinationSelection =
       createVisibleSelectionDeprecated(destination, originalIsDirectional);
   if (endingSelection().isNone()) {
     // We abort executing command since |destination| becomes invisible.
     editingState->abort();
     return;
@@ skipping 348 matching lines @@
   return node;
 }
 
 DEFINE_TRACE(CompositeEditCommand) {
   visitor->trace(m_commands);
   visitor->trace(m_composition);
   EditCommand::trace(visitor);
 }
 
 }  // namespace blink