Editing: Fix caret blinking after a typing.

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 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/editing/FrameCaret.h"
 
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/editing/CaretDisplayItemClient.h"
 #include "core/editing/EditingUtilities.h"
-#include "core/editing/Editor.h"
 #include "core/editing/SelectionEditor.h"
-#include "core/editing/commands/CompositeEditCommand.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/TextControlElement.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/api/LayoutPartItem.h"
 #include "core/page/Page.h"
 #include "public/platform/WebTraceLocation.h"
 
 namespace blink {
 
 FrameCaret::FrameCaret(LocalFrame& frame,
                        const SelectionEditor& selectionEditor)
     : m_selectionEditor(&selectionEditor),
       m_frame(frame),
       m_displayItemClient(new CaretDisplayItemClient()),
       m_caretVisibility(CaretVisibility::Hidden),
-      m_caretBlinkTimer(TaskRunnerHelper::get(TaskType::UnspecedTimer, &frame),
-                        this,
-                        &FrameCaret::caretBlinkTimerFired),
+      m_caretBlinkTimer(new TaskRunnerTimer<FrameCaret>(
+          TaskRunnerHelper::get(TaskType::UnspecedTimer, &frame),
+          this,
+          &FrameCaret::caretBlinkTimerFired)),
       m_shouldPaintCaret(true),
       m_isCaretBlinkingSuspended(false),
       m_shouldShowBlockCursor(false) {}
 
 FrameCaret::~FrameCaret() = default;
 
 DEFINE_TRACE(FrameCaret) {
   visitor->trace(m_selectionEditor);
   visitor->trace(m_frame);
 }
 
 const DisplayItemClient& FrameCaret::displayItemClient() const {
   return *m_displayItemClient;
 }
 
 const PositionWithAffinity FrameCaret::caretPosition() const {
   const VisibleSelection& selection =
       m_selectionEditor->computeVisibleSelectionInDOMTree();
   if (!selection.isCaret())
     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 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))
+  if (!shouldBlink) {

[yosin_UTC9, 2017/03/01 03:21:07]

nit: I prefer early-return style to reduce indentation.

[tkent, 2017/03/01 05:50:40]

Done.

     stopCaretBlinkTimer();
-
-  // Start blinking with a black caret. Be sure not to restart if we're
-  // already blinking in the right location.
-  if (shouldBlink)
+  } else {
+    // Start blinking with a black caret. Be sure not to restart if we're
+    // already blinking in the right location.
     startBlinkCaret();
+  }
 }
 
 void FrameCaret::stopCaretBlinkTimer() {
-  if (m_caretBlinkTimer.isActive() || m_shouldPaintCaret)
+  if (m_caretBlinkTimer->isActive() || m_shouldPaintCaret)
     scheduleVisualUpdateForPaintInvalidationIfNeeded();
   m_shouldPaintCaret = false;
-  m_caretBlinkTimer.stop();
+  m_caretBlinkTimer->stop();
 }
 
 void FrameCaret::startBlinkCaret() {
   // Start blinking with a black caret. Be sure not to restart if we're
   // already blinking in the right location.
-  if (m_caretBlinkTimer.isActive())
+  if (m_caretBlinkTimer->isActive())
     return;
 
   if (double blinkInterval = LayoutTheme::theme().caretBlinkInterval())
-    m_caretBlinkTimer.startRepeating(blinkInterval, BLINK_FROM_HERE);
+    m_caretBlinkTimer->startRepeating(blinkInterval, BLINK_FROM_HERE);
 
   m_shouldPaintCaret = true;
   scheduleVisualUpdateForPaintInvalidationIfNeeded();
 }
 
 void FrameCaret::setCaretVisibility(CaretVisibility visibility) {
   if (m_caretVisibility == visibility)
     return;
 
   m_caretVisibility = visibility;
@@ skipping 100 matching lines @@
     return;
   m_shouldPaintCaret = !m_shouldPaintCaret;
   scheduleVisualUpdateForPaintInvalidationIfNeeded();
 }
 
 void FrameCaret::scheduleVisualUpdateForPaintInvalidationIfNeeded() {
   if (FrameView* frameView = m_frame->view())
     frameView->scheduleVisualUpdateForPaintInvalidationIfNeeded();
 }
 
+void FrameCaret::recreateCaretBlinkTimerForTesting(
+    RefPtr<WebTaskRunner> taskRunner) {
+  m_caretBlinkTimer.reset(new TaskRunnerTimer<FrameCaret>(
+      std::move(taskRunner), this, &FrameCaret::caretBlinkTimerFired));
+}
+
 }  // namespace blink