Make EnabledInRichlyEditableText return false for user-triggered command and unfocused selection

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

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Igalia S.L.
  *
  * 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.
@@ skipping 2033 matching lines @@
 }
 
 static bool EnabledCut(LocalFrame& frame, Event*, EditorCommandSource source) {
   if (!CanWriteClipboard(frame, source))
     return false;
   return frame.GetEditor().CanDHTMLCut() || frame.GetEditor().CanCut();
 }
 
 static bool EnabledInEditableText(LocalFrame& frame,
                                   Event* event,
-                                  EditorCommandSource) {
+                                  EditorCommandSource source) {
   frame.GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
   return frame.GetEditor().SelectionForCommand(event).RootEditableElement();
 }
 
 static bool EnabledDelete(LocalFrame& frame,
                           Event* event,
                           EditorCommandSource source) {
   switch (source) {
     case kCommandFromMenuOrKeyBinding:
       return frame.GetEditor().CanDelete();
     case kCommandFromDOM:
       // "Delete" from DOM is like delete/backspace keypress, affects selected
       // range if non-empty, otherwise removes a character
       return EnabledInEditableText(frame, event, source);
   }
   NOTREACHED();
   return false;
 }
 
 static bool EnabledInRichlyEditableText(LocalFrame& frame,
                                         Event*,
-                                        EditorCommandSource) {
+                                        EditorCommandSource source) {
   frame.GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
+  if (source == kCommandFromMenuOrKeyBinding &&
+      !frame.Selection().SelectionHasFocus())
+    return false;
   return !frame.Selection()
               .ComputeVisibleSelectionInDOMTreeDeprecated()
               .IsNone() &&
          frame.Selection()
              .ComputeVisibleSelectionInDOMTreeDeprecated()
              .IsContentRichlyEditable() &&
          frame.Selection()
              .ComputeVisibleSelectionInDOMTreeDeprecated()
              .RootEditableElement();
 }
@@ skipping 889 matching lines @@
           *frame_, kDirectionBackward, kWordGranularity);
     case WebEditingCommandType::kDeleteWordForward:
       return RangesFromCurrentSelectionOrExtendCaret(*frame_, kDirectionForward,
                                                      kWordGranularity);
     default:
       return TargetRangesForInputEvent(*target);
   }
 }
 
 }  // namespace blink