Revert of Make FrameSelection to hold non-canonicalized positions

third_party/WebKit/Source/core/editing/FrameCaret.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 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 63 matching lines @@
     return PositionWithAffinity();
   return PositionWithAffinity(selection.start(), selection.affinity());
 }
 
 inline static bool shouldStopBlinkingDueToTypingCommand(LocalFrame* frame) {
   return frame->editor().lastEditCommand() &&
          frame->editor().lastEditCommand()->shouldStopCaretBlinking();
 }
 
 void FrameCaret::updateAppearance() {
-  DCHECK_GE(m_frame->document()->lifecycle().state(),
-            DocumentLifecycle::LayoutClean);
   // Paint a block cursor instead of a caret in overtype mode unless the caret
   // is at the end of a line (in this case the FrameSelection will paint a
   // blinking caret as usual).
-  const bool paintBlockCursor =
-      m_shouldShowBlockCursor && isActive() &&
-      !isLogicalEndOfLine(createVisiblePosition(caretPosition()));
+  bool paintBlockCursor = m_shouldShowBlockCursor && isActive();
+  if (paintBlockCursor) {
+    // TODO(editing-dev): Use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  see http://crbug.com/590369 for more details.
+    // In the long term, we should defer the update of the caret's appearance
+    // to prevent synchronous layout.
+    m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
+    if (isLogicalEndOfLine(createVisiblePosition(caretPosition())))
+      paintBlockCursor = false;
+  }
 
   bool shouldBlink = !paintBlockCursor && shouldBlinkCaret();
 
   // If the caret moved, stop the blink timer so we can restart with a
   // black caret in the new location.
   if (!shouldBlink || shouldStopBlinkingDueToTypingCommand(m_frame))
     stopCaretBlinkTimer();
 
   // Start blinking with a black caret. Be sure not to restart if we're
   // already blinking in the right location.
@@ skipping 20 matching lines @@
   m_shouldPaintCaret = true;
   scheduleVisualUpdateForPaintInvalidationIfNeeded();
 }
 
 void FrameCaret::setCaretVisibility(CaretVisibility visibility) {
   if (m_caretVisibility == visibility)
     return;
 
   m_caretVisibility = visibility;
 
-  if (visibility == CaretVisibility::Hidden)
-    stopCaretBlinkTimer();
+  updateAppearance();
   scheduleVisualUpdateForPaintInvalidationIfNeeded();
 }
 
 void FrameCaret::clearPreviousVisualRect(const LayoutBlock& block) {
   m_displayItemClient->clearPreviousVisualRect(block);
 }
 
 void FrameCaret::layoutBlockWillBeDestroyed(const LayoutBlock& block) {
   m_displayItemClient->layoutBlockWillBeDestroyed(block);
 }
 
 void FrameCaret::updateStyleAndLayoutIfNeeded() {
-  DCHECK_GE(m_frame->document()->lifecycle().state(),
-            DocumentLifecycle::LayoutClean);
-  updateAppearance();
   bool shouldPaintCaret =
       m_shouldPaintCaret && isActive() &&
       m_caretVisibility == CaretVisibility::Visible &&
       m_selectionEditor->visibleSelection<EditingStrategy>().hasEditableStyle();
 
   m_displayItemClient->updateStyleAndLayoutIfNeeded(
       shouldPaintCaret ? caretPosition() : PositionWithAffinity());
 }
 
 void FrameCaret::invalidatePaintIfNeeded(const LayoutBlock& block,
@@ skipping 31 matching lines @@
   if (!isActive())
     return absoluteBoundsForLocalRect(caretNode, LayoutRect());
   return absoluteBoundsForLocalRect(
       caretNode,
       CaretDisplayItemClient::computeCaretRect(
           createVisiblePosition(caretPosition()).toPositionWithAffinity()));
 }
 
 void FrameCaret::setShouldShowBlockCursor(bool shouldShowBlockCursor) {
   m_shouldShowBlockCursor = shouldShowBlockCursor;
-  scheduleVisualUpdateForPaintInvalidationIfNeeded();
+
+  m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
+  updateAppearance();
 }
 
 bool FrameCaret::shouldPaintCaret(const LayoutBlock& block) const {
   return m_displayItemClient->shouldPaintCaret(block);
 }
 
 void FrameCaret::paintCaret(GraphicsContext& context,
                             const LayoutPoint& paintOffset) const {
   m_displayItemClient->paintCaret(context, paintOffset, DisplayItem::kCaret);
 }
@@ skipping 21 matching lines @@
   m_shouldPaintCaret = !m_shouldPaintCaret;
   scheduleVisualUpdateForPaintInvalidationIfNeeded();
 }
 
 void FrameCaret::scheduleVisualUpdateForPaintInvalidationIfNeeded() {
   if (FrameView* frameView = m_frame->view())
     frameView->scheduleVisualUpdateForPaintInvalidationIfNeeded();
 }
 
 }  // namespace blink