Don't show caret when containing element doesn't have focus

Source/core/editing/FrameSelection.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 489 matching lines @@
     if (startPosition.isNotNull())
         startPosition.getInlineBoxAndOffset(startBox, unusedOffset);
     if (endPosition.isNotNull())
         endPosition.getInlineBoxAndOffset(endBox, unusedOffset);
     if (startBox && endBox && startBox->direction() == endBox->direction())
         return startBox->direction();
 
     return directionOfEnclosingBlock();
 }
 
+void FrameSelection::didFocusChanged()
+{
+    updateAppearance();
+}
+
 void FrameSelection::willBeModified(EAlteration alter, SelectionDirection direction)
 {
     if (alter != AlterationExtend)
         return;
 
     Position start = m_selection.start();
     Position end = m_selection.end();
 
     bool baseIsStart = true;
 
@@ skipping 1252 matching lines @@
     // 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).
     VisiblePosition forwardPosition;
     if (m_shouldShowBlockCursor && m_selection.isCaret()) {
         forwardPosition = modifyExtendingForward(CharacterGranularity);
         m_caretPaint = forwardPosition.isNull();
     }
 
     bool caretRectChangedOrCleared = recomputeCaretRect();
 
     bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();

[tkent, 2013/06/28 06:46:56]

The variable 'caretBrowing' is not used.

[yosin_UTC9, 2013/06/28 08:22:46]

Done.

-    bool shouldBlink = caretIsVisible() && isCaret() && (isContentEditable() || caretBrowsing) && forwardPosition.isNull();
+    bool shouldBlink = shouldBlinkCaret() && forwardPosition.isNull();
 
     // If the caret moved, stop the blink timer so we can restart with a
     // black caret in the new location.
-    if (caretRectChangedOrCleared || !shouldBlink || shouldStopBlinkingDueToTypingCommand(m_frame))
+    if (caretRectChangedOrCleared || !shouldBlink || shouldStopBlinkingDueToTypingCommand(m_frame)) {
         m_caretBlinkTimer.stop();
+        if (!shouldBlink && m_caretPaint) {
+            m_caretPaint = false;
+            invalidateCaretRect();
+        }
+    }
 
     // Start blinking with a black caret. Be sure not to restart if we're
     // already blinking in the right location.
     if (shouldBlink && !m_caretBlinkTimer.isActive()) {
         if (double blinkInterval = m_frame->page()->theme()->caretBlinkInterval())
             m_caretBlinkTimer.startRepeating(blinkInterval);
 
         if (!m_caretPaint) {
             m_caretPaint = true;
             invalidateCaretRect();
@@ skipping 43 matching lines @@
     m_frame->document()->updateLayoutIgnorePendingStylesheets();
     if (m_caretPaint) {
         m_caretPaint = false;
         invalidateCaretRect();
     }
     CaretBase::setCaretVisibility(visibility);
 
     updateAppearance();
 }
 
+bool FrameSelection::shouldBlinkCaret() const
+{
+    if (!caretIsVisible() || !isCaret())
+        return false;
+
+    if (m_frame->settings() && m_frame->settings()->caretBrowsingEnabled())
+        return false;
+
+    Node* root = rootEditableElement();
+    if (!root)
+        return false;
+
+    Node* focusedNode = root->document()->focusedNode();
+    if (!focusedNode)
+        return false;
+
+    return focusedNode->containsIncludingShadowDOM(m_selection.start().deprecatedNode());

[tkent, 2013/06/28 06:46:56]

We should not use deprecatedNode in new code.

[yosin_UTC9, 2013/06/28 08:22:46]

Done.

+}
+
 void FrameSelection::caretBlinkTimerFired(Timer<FrameSelection>*)
 {
     ASSERT(caretIsVisible());
     ASSERT(isCaret());
     bool caretPaint = m_caretPaint;
     if (isCaretBlinkingSuspended() && caretPaint)
         return;
     m_caretPaint = !caretPaint;
     invalidateCaretRect();
 }
@@ skipping 235 matching lines @@
     sel.showTreeForThis();
 }
 
 void showTree(const WebCore::FrameSelection* sel)
 {
     if (sel)
         sel->showTreeForThis();
 }
 
 #endif