Remove mail blockquote special case handling.

Source/WebCore/editing/CompositeEditCommand.cpp

 /*
  * Copyright (C) 2005, 2006, 2007, 2008 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 270 matching lines @@
 void CompositeEditCommand::applyStyledElement(PassRefPtr<Element> element)
 {
     applyCommandToComposite(ApplyStyleCommand::create(element, false));
 }
 
 void CompositeEditCommand::removeStyledElement(PassRefPtr<Element> element)
 {
     applyCommandToComposite(ApplyStyleCommand::create(element, true));
 }
 
-void CompositeEditCommand::insertParagraphSeparator(bool useDefaultParagraphElement, bool pasteBlockqutoeIntoUnquotedArea)
+void CompositeEditCommand::insertParagraphSeparator(bool useDefaultParagraphElement)
 {
-    applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), useDefaultParagraphElement, pasteBlockqutoeIntoUnquotedArea));
+    applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), useDefaultParagraphElement));
 }
 
 void CompositeEditCommand::insertLineBreak()
 {
     applyCommandToComposite(InsertLineBreakCommand::create(document()));
 }
 
 bool CompositeEditCommand::isRemovableBlock(const Node* node)
 {
     if (!node->hasTagName(divTag))
@@ skipping 1010 matching lines @@
     appendBlockPlaceholder(newBlock);
     setEndingSelection(VisibleSelection(firstPositionInNode(newBlock.get()), DOWNSTREAM, endingSelection().isDirectional()));
 
     style->prepareToApplyAt(endingSelection().start());
     if (!style->isEmpty())
         applyStyle(style.get());
 
     return true;
 }
 
-// If the caret is in an empty quoted paragraph, and either there is nothing before that
-// paragraph, or what is before is unquoted, and the user presses delete, unquote that paragraph.
-bool CompositeEditCommand::breakOutOfEmptyMailBlockquotedParagraph()
-{
-    if (!endingSelection().isCaret())
-        return false;
-        
-    VisiblePosition caret(endingSelection().visibleStart());
-    Node* highestBlockquote = highestEnclosingNodeOfType(caret.deepEquivalent(), &isMailBlockquote);
-    if (!highestBlockquote)
-        return false;
-        
-    if (!isStartOfParagraph(caret) || !isEndOfParagraph(caret))
-        return false;
-    
-    VisiblePosition previous(caret.previous(CannotCrossEditingBoundary));
-    // Only move forward if there's nothing before the caret, or if there's unquoted content before it.
-    if (enclosingNodeOfType(previous.deepEquivalent(), &isMailBlockquote))
-        return false;
-    
-    RefPtr<Node> br = createBreakElement(document());
-    // We want to replace this quoted paragraph with an unquoted one, so insert a br
-    // to hold the caret before the highest blockquote.
-    insertNodeBefore(br, highestBlockquote);
-    VisiblePosition atBR(positionBeforeNode(br.get()));
-    // If the br we inserted collapsed, for example foo<br><blockquote>...</blockquote>, insert
-    // a second one.
-    if (!isStartOfParagraph(atBR))
-        insertNodeBefore(createBreakElement(document()), br);
-    setEndingSelection(VisibleSelection(atBR, endingSelection().isDirectional()));
-    
-    // If this is an empty paragraph there must be a line break here.
-    if (!lineBreakExistsAtVisiblePosition(caret))
-        return false;
-
-    Position caretPos(caret.deepEquivalent().downstream());
-    // A line break is either a br or a preserved newline.
-    ASSERT(caretPos.deprecatedNode()->hasTagName(brTag) || (caretPos.deprecatedNode()->isTextNode() && caretPos.deprecatedNode()->renderer()->style()->preserveNewline()));
-    
-    if (caretPos.deprecatedNode()->hasTagName(brTag))
-        removeNodeAndPruneAncestors(caretPos.deprecatedNode());
-    else if (caretPos.deprecatedNode()->isTextNode()) {
-        ASSERT(caretPos.deprecatedEditingOffset() == 0);
-        Text* textNode = toText(caretPos.deprecatedNode());
-        ContainerNode* parentNode = textNode->parentNode();
-        // The preserved newline must be the first thing in the node, since otherwise the previous
-        // paragraph would be quoted, and we verified that it wasn't above.
-        deleteTextFromNode(textNode, 0, 1);
-        prune(parentNode);
-    }
-
-    return true;
-}
-
 // Operations use this function to avoid inserting content into an anchor when at the start or the end of
 // that anchor, as in NSTextView.
 // FIXME: This is only an approximation of NSTextViews insertion behavior, which varies depending on how
 // the caret was made. 
 Position CompositeEditCommand::positionAvoidingSpecialElementBoundary(const Position& original)
 {
     if (original.isNull())
         return original;
         
     VisiblePosition visiblePos(original);
@@ skipping 74 matching lines @@
     return node.release();
 }
 
 PassRefPtr<Element> createBlockPlaceholderElement(Document* document)
 {
     RefPtr<Element> breakNode = document->createElement(brTag, false);
     return breakNode.release();
 }
 
 } // namespace WebCore