Prune CreateVisiblePositionDeprecated from Editor::canDeleteRange

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;
 
-    if (!hasEditableStyle(*startContainer) || !hasEditableStyle(*endContainer))
-        return false;
-
-    if (range.isCollapsed()) {
-        VisiblePosition start = createVisiblePositionDeprecated(range.startPosition());
-        VisiblePosition previous = previousPositionOf(start);
-        // FIXME: We sometimes allow deletions at the start of editable roots, like when the caret is in an empty list item.
-        if (previous.isNull() || rootEditableElement(*previous.deepEquivalent().anchorNode()) != rootEditableElement(*startContainer))
-            return false;
-    }
-    return true;
+    return hasEditableStyle(*startContainer) && hasEditableStyle(*endContainer);
 }
 
 bool Editor::smartInsertDeleteEnabled() const
 {
     if (Settings* settings = frame().settings())
         return settings->smartInsertDeleteEnabled();
     return false;
 }
 
 bool Editor::canSmartCopyOrDelete() const
@@ skipping 1122 matching lines @@
 
 DEFINE_TRACE(Editor)
 {
     visitor->trace(m_frame);
     visitor->trace(m_lastEditCommand);
     visitor->trace(m_undoStack);
     visitor->trace(m_mark);
 }
 
 } // namespace blink