Prune createVisiblePositionDeprecated

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 @@
 
 inline static bool shouldStopBlinkingDueToTypingCommand(LocalFrame* frame) {
   return frame->editor().lastEditCommand() &&
          frame->editor().lastEditCommand()->shouldStopCaretBlinking();
 }
 
 void FrameCaret::updateAppearance() {
   // 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).
-  bool paintBlockCursor =
-      m_shouldShowBlockCursor && isActive() &&
-      !isLogicalEndOfLine(createVisiblePositionDeprecated(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 184 matching lines @@
 
 void FrameCaret::caretBlinkTimerFired(TimerBase*) {
   DCHECK_EQ(m_caretVisibility, CaretVisibility::Visible);
   if (isCaretBlinkingSuspended() && m_shouldPaintCaret)
     return;
   m_shouldPaintCaret = !m_shouldPaintCaret;
   setCaretRectNeedsUpdate();
 }
 
 }  // namespace blink