Merge can/shouldDeleteRange in Editor

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 264 matching lines @@
 {
     return canEdit();
 }
 
 bool Editor::canDelete() const
 {
     FrameSelection& selection = frame().selection();
     return selection.isRange() && selection.rootEditableElement();
 }
 
-// TODO(xiaochengh): Merge it with |shouldDeleteRange|.
-bool Editor::canDeleteRange(const EphemeralRange& range) const
-{
-    DCHECK(!range.isCollapsed()) << range.startPosition();
-
-    Node* startContainer = range.startPosition().computeContainerNode();
-    Node* endContainer = range.endPosition().computeContainerNode();
-    if (!startContainer || !endContainer)
-        return false;
-
-    return hasEditableStyle(*startContainer) && hasEditableStyle(*endContainer);
-}
-
 bool Editor::smartInsertDeleteEnabled() const
 {
     if (Settings* settings = frame().settings())
         return settings->smartInsertDeleteEnabled();
     return false;
 }
 
 bool Editor::canSmartCopyOrDelete() const
 {
     return smartInsertDeleteEnabled() && frame().selection().granularity() == WordGranularity;
@@ skipping 262 matching lines @@
 void Editor::moveSelectionAfterDragging(DocumentFragment* fragment, const Position& pos, bool smartInsert, bool smartDelete)
 {
     MoveSelectionCommand::create(fragment, pos, smartInsert, smartDelete)->apply();
 }
 
 EphemeralRange Editor::selectedRange()
 {
     return frame().selection().selection().toNormalizedEphemeralRange();
 }
 
-bool Editor::shouldDeleteRange(const EphemeralRange& range) const
+bool Editor::canDeleteRange(const EphemeralRange& range) const
 {
     if (range.isCollapsed())
         return false;
 
-    return canDeleteRange(range);
+    Node* startContainer = range.startPosition().computeContainerNode();
+    Node* endContainer = range.endPosition().computeContainerNode();
+    if (!startContainer || !endContainer)
+        return false;
+
+    return hasEditableStyle(*startContainer) && hasEditableStyle(*endContainer);
 }
 
 void Editor::notifyComponentsOnChangedSelection()
 {
     client().respondToChangedSelection(m_frame, frame().selection().getSelectionType());
     setStartNewKillRingSequence(true);
 }
 
 void Editor::respondToChangedContents(const VisibleSelection& endingSelection)
 {
@@ skipping 283 matching lines @@
     return true;
 }
 
 void Editor::cut(EditorCommandSource source)
 {
     if (tryDHTMLCut())
         return; // DHTML did the whole operation
     if (!canCut())
         return;
     // TODO(yosin) We should use early return style here.
-    if (shouldDeleteRange(selectedRange())) {
+    if (canDeleteRange(selectedRange())) {
         spellChecker().updateMarkersForWordsAffectedByEditing(true);
         if (enclosingTextFormControl(frame().selection().start())) {
             String plainText = frame().selectedTextForClipboard();
             Pasteboard::generalPasteboard()->writePlainText(plainText,
                 canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
         } else {
             writeSelectionToPasteboard();
         }
 
         if (source == CommandFromMenuOrKeyBinding) {
@@ skipping 528 matching lines @@
 
 DEFINE_TRACE(Editor)
 {
     visitor->trace(m_frame);
     visitor->trace(m_lastEditCommand);
     visitor->trace(m_undoStack);
     visitor->trace(m_mark);
 }
 
 } // namespace blink