Remove mail blockquote special case handling.

Source/WebCore/editing/TypingCommand.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 192 matching lines @@
     ASSERT(document);
     if (RefPtr<TypingCommand> lastTypingCommand = lastTypingCommandIfStillOpenForTyping(document->frame())) {
         lastTypingCommand->setShouldRetainAutocorrectionIndicator(options & RetainAutocorrectionIndicator);
         lastTypingCommand->insertLineBreak();
         return;
     }
 
     applyCommand(TypingCommand::create(document, InsertLineBreak, "", options));
 }
 
-void TypingCommand::insertParagraphSeparatorInQuotedContent(Document *document)
-{
-    ASSERT(document);
-    if (RefPtr<TypingCommand> lastTypingCommand = lastTypingCommandIfStillOpenForTyping(document->frame())) {
-        lastTypingCommand->insertParagraphSeparatorInQuotedContent();
-        return;
-    }
-
-    applyCommand(TypingCommand::create(document, InsertParagraphSeparatorInQuotedContent));
-}
-
 void TypingCommand::insertParagraphSeparator(Document *document, Options options)
 {
     ASSERT(document);
     if (RefPtr<TypingCommand> lastTypingCommand = lastTypingCommandIfStillOpenForTyping(document->frame())) {
         lastTypingCommand->setShouldRetainAutocorrectionIndicator(options & RetainAutocorrectionIndicator);
         lastTypingCommand->insertParagraphSeparator();
         return;
     }
 
     applyCommand(TypingCommand::create(document, InsertParagraphSeparator, "", options));
@@ skipping 34 matching lines @@
         return;
     case ForwardDeleteKey:
         forwardDeleteKeyPressed(m_granularity, m_killRing);
         return;
     case InsertLineBreak:
         insertLineBreak();
         return;
     case InsertParagraphSeparator:
         insertParagraphSeparator();
         return;
-    case InsertParagraphSeparatorInQuotedContent:
-        insertParagraphSeparatorInQuotedContent();
-        return;
     case InsertText:
         insertText(m_textToInsert, m_selectInsertedText);
         return;
     }
 
     ASSERT_NOT_REACHED();
 }
 
 EditAction TypingCommand::editingAction() const
 {
@@ skipping 22 matching lines @@
     // see if typing made a new word that is not in the current selection. Basically, you
     // get this by being at the end of a word and typing a space.    
     VisiblePosition start(endingSelection().start(), endingSelection().affinity());
     VisiblePosition previous = start.previous();
     if (previous.isNotNull()) {
         VisiblePosition p1 = startOfWord(previous, LeftWordIfOnBoundary);
         VisiblePosition p2 = startOfWord(start, LeftWordIfOnBoundary);
         if (p1 != p2) {
             RefPtr<Range> range = makeRange(p1, p2);
             String strippedPreviousWord;
-            if (range && (commandType == TypingCommand::InsertText || commandType == TypingCommand::InsertLineBreak || commandType == TypingCommand::InsertParagraphSeparator || commandType == TypingCommand::InsertParagraphSeparatorInQuotedContent))
+            if (range && (commandType == TypingCommand::InsertText || commandType == TypingCommand::InsertLineBreak || commandType == TypingCommand::InsertParagraphSeparator))
                 strippedPreviousWord = plainText(range.get()).stripWhiteSpace();
             frame->editor()->markMisspellingsAfterTypingToWord(p1, endingSelection(), !strippedPreviousWord.isEmpty());
         } else if (commandType == TypingCommand::InsertText)
             frame->editor()->startAlternativeTextUITimer();
     }
 }
 
 void TypingCommand::typingAddedToOpenCommand(ETypingCommand commandTypeForAddedTyping)
 {
     Frame* frame = document()->frame();
@@ skipping 46 matching lines @@
 
 void TypingCommand::insertParagraphSeparator()
 {
     if (!canAppendNewLineFeedToSelection(endingSelection()))
         return;
 
     applyCommandToComposite(InsertParagraphSeparatorCommand::create(document()));
     typingAddedToOpenCommand(InsertParagraphSeparator);
 }
 
-void TypingCommand::insertParagraphSeparatorInQuotedContent()
-{
-    // If the selection starts inside a table, just insert the paragraph separator normally
-    // Breaking the blockquote would also break apart the table, which is unecessary when inserting a newline
-    if (enclosingNodeOfType(endingSelection().start(), &isTableStructureNode)) {
-        insertParagraphSeparator();
-        return;
-    }
-        
-    applyCommandToComposite(BreakBlockquoteCommand::create(document()));
-    typingAddedToOpenCommand(InsertParagraphSeparatorInQuotedContent);
-}
-
 bool TypingCommand::makeEditableRootEmpty()
 {
     Element* root = endingSelection().rootEditableElement();
     if (!root || !root->firstChild())
         return false;
 
     if (root->firstChild() == root->lastChild() && root->firstElementChild() && root->firstElementChild()->hasTagName(brTag)) {
         // If there is a single child and it could be a placeholder, leave it alone.
         if (root->renderer() && root->renderer()->isBlockFlow())
             return false;
@@ skipping 18 matching lines @@
 
     VisibleSelection selectionToDelete;
     VisibleSelection selectionAfterUndo;
 
     switch (endingSelection().selectionType()) {
     case VisibleSelection::RangeSelection:
         selectionToDelete = endingSelection();
         selectionAfterUndo = selectionToDelete;
         break;
     case VisibleSelection::CaretSelection: {
-        // After breaking out of an empty mail blockquote, we still want continue with the deletion
-        // so actual content will get deleted, and not just the quote style.
-        if (breakOutOfEmptyMailBlockquotedParagraph())
-            typingAddedToOpenCommand(DeleteKey);
-
         m_smartDelete = false;
 
         FrameSelection selection;
         selection.setSelection(endingSelection());
         selection.modify(FrameSelection::AlterationExtend, DirectionBackward, granularity);
         if (killRing && selection.isCaret() && granularity != CharacterGranularity)
             selection.modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity);
 
         if (endingSelection().visibleStart().previous(CannotCrossEditingBoundary).isNull()) {
             // When the caret is at the start of the editable area in an empty list item, break out of the list item.
@@ skipping 168 matching lines @@
 void TypingCommand::updatePreservesTypingStyle(ETypingCommand commandType)
 {
     switch (commandType) {
     case DeleteSelection:
     case DeleteKey:
     case ForwardDeleteKey:
     case InsertParagraphSeparator:
     case InsertLineBreak:
         m_preservesTypingStyle = true;
         return;
-    case InsertParagraphSeparatorInQuotedContent:
     case InsertText:
         m_preservesTypingStyle = false;
         return;
     }
     ASSERT_NOT_REACHED();
     m_preservesTypingStyle = false;
 }
 
 bool TypingCommand::isTypingCommand() const
 {
     return true;
 }
 
 } // namespace WebCore