Fix behavior of clipboard commands when there is unfocused selection

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
@@ skipping 1122 matching lines @@
     return;  // DHTML did the whole operation
   if (!CanCut())
     return;
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   // |tryDHTMLCut| dispatches cut event, which may make layout dirty, but we
   // need clean layout to obtain the selected content.
   GetFrame().GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
+  if (source == kCommandFromMenuOrKeyBinding &&
+      !GetFrame().Selection().SelectionHasFocus())
+    return;
+
   // TODO(yosin) We should use early return style here.
   if (CanDeleteRange(SelectedRange())) {
     GetSpellChecker().UpdateMarkersForWordsAffectedByEditing(true);
     if (EnclosingTextControl(GetFrame()
                                  .Selection()
                                  .ComputeVisibleSelectionInDOMTree()
                                  .Start())) {
       String plain_text = GetFrame().SelectedTextForClipboard();
       Pasteboard::GeneralPasteboard()->WritePlainText(
           plain_text, CanSmartCopyOrDelete() ? Pasteboard::kCanSmartReplace
@@ skipping 11 matching lines @@
       // 'beforeinput' event handler may destroy target frame.
       if (frame_->GetDocument()->GetFrame() != frame_)
         return;
     }
     DeleteSelectionWithSmartDelete(
         CanSmartCopyOrDelete() ? DeleteMode::kSmart : DeleteMode::kSimple,
         InputEvent::InputType::kDeleteByCut);
   }
 }
 
-void Editor::Copy() {
+void Editor::Copy(EditorCommandSource source) {
   if (TryDHTMLCopy())
     return;  // DHTML did the whole operation
   if (!CanCopy())
     return;
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   // |tryDHTMLCopy| dispatches copy event, which may make layout dirty, but
   // we need clean layout to obtain the selected content.
   GetFrame().GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
+  if (source == kCommandFromMenuOrKeyBinding &&
+      !GetFrame().Selection().SelectionHasFocus())
+    return;
+
   if (EnclosingTextControl(
           GetFrame().Selection().ComputeVisibleSelectionInDOMTree().Start())) {
     Pasteboard::GeneralPasteboard()->WritePlainText(
         GetFrame().SelectedTextForClipboard(),
         CanSmartCopyOrDelete() ? Pasteboard::kCanSmartReplace
                                : Pasteboard::kCannotSmartReplace);
   } else {
     Document* document = GetFrame().GetDocument();
     if (HTMLImageElement* image_element =
             ImageElementFromImageDocument(document))
       WriteImageNodeToPasteboard(Pasteboard::GeneralPasteboard(), image_element,
                                  document->title());
     else
       WriteSelectionToPasteboard();
   }
 }
 
 void Editor::Paste(EditorCommandSource source) {
   DCHECK(GetFrame().GetDocument());
   if (TryDHTMLPaste(kAllMimeTypes))
     return;  // DHTML did the whole operation
   if (!CanPaste())
     return;
+
+  // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
+  // needs to be audited.  See http://crbug.com/590369 for more details.
+  // |tryDHTMLPaste| dispatches copy event, which may make layout dirty, but
+  // we need clean layout to obtain the selected content.
+  GetFrame().GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
+
+  if (source == kCommandFromMenuOrKeyBinding &&
+      !GetFrame().Selection().SelectionHasFocus())
+    return;
+
   GetSpellChecker().UpdateMarkersForWordsAffectedByEditing(false);
   ResourceFetcher* loader = GetFrame().GetDocument()->Fetcher();
   ResourceCacheValidationSuppressor validation_suppressor(loader);
 
   PasteMode paste_mode = GetFrame()
                                  .Selection()
                                  .ComputeVisibleSelectionInDOMTree()
                                  .IsContentRichlyEditable()
                              ? kAllMimeTypes
                              : kPlainTextOnly;
@@ skipping 17 matching lines @@
     PasteWithPasteboard(Pasteboard::GeneralPasteboard());
   else
     PasteAsPlainTextWithPasteboard(Pasteboard::GeneralPasteboard());
 }
 
 void Editor::PasteAsPlainText(EditorCommandSource source) {
   if (TryDHTMLPaste(kPlainTextOnly))
     return;
   if (!CanPaste())
     return;
+
+  // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
+  // needs to be audited.  See http://crbug.com/590369 for more details.
+  // |tryDHTMLPaste| dispatches copy event, which may make layout dirty, but
+  // we need clean layout to obtain the selected content.
+  GetFrame().GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
+
+  if (source == kCommandFromMenuOrKeyBinding &&
+      !GetFrame().Selection().SelectionHasFocus())
+    return;
+
   GetSpellChecker().UpdateMarkersForWordsAffectedByEditing(false);
   PasteAsPlainTextWithPasteboard(Pasteboard::GeneralPasteboard());
 }
 
 void Editor::PerformDelete() {
   if (!CanDelete())
     return;
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
@@ skipping 562 matching lines @@
 
 DEFINE_TRACE(Editor) {
   visitor->Trace(frame_);
   visitor->Trace(last_edit_command_);
   visitor->Trace(undo_stack_);
   visitor->Trace(mark_);
   visitor->Trace(typing_style_);
 }
 
 }  // namespace blink