commit 17bab067e3b3f6618395e141938e5cda8d26c956
author harrison <harrison@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Oct 08 00:50:30 2005 +0000
committer harrison <harrison@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Oct 08 00:50:30 2005 +0000
tree fd93c2ca8dc79aa1cc3dfc8d25f4d0bc72cec7b9
parent 7ff21879bcf14a5e6f45d9ce83896564278b0b99

        Reviewed by Justin.

        "<rdar://problem/4064017> Safari crashes at -[WebCoreBridge firstRectForDOMRange:] + 92"

        * khtml/editing/delete_selection_command.cpp:
        (khtml::DeleteSelectionCommand::insertPlaceholderForAncestorBlockContent):
        Do not insert placeholder if selection ends at a BR.

        (khtml::DeleteSelectionCommand::handleGeneralDelete):
        No need to preserve starting BR because insertPlaceholderForAncestorBlockContent already did.

        * khtml/xml/dom_position.cpp:
        (DOM::Position::upstream):
        (DOM::Position::downstream):
        Fixed to return original position instead of invisible position when no suitable position found upstream.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@10786 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/khtml/editing/delete_selection_command.cpp

diff --git a/WebCore/khtml/editing/delete_selection_command.cpp b/WebCore/khtml/editing/delete_selection_command.cpp
index bf2512a..b5102de 100644
--- a/WebCore/khtml/editing/delete_selection_command.cpp
+++ b/WebCore/khtml/editing/delete_selection_command.cpp
@@ -263,7 +263,7 @@
         VisiblePosition afterEnd = visibleEnd.next();
         
         if ((!afterEnd.isNull() && !inSameBlock(afterEnd, visibleEnd) && !inSameBlock(afterEnd, visibleStart)) ||
-            (m_downstreamEnd == m_selectionToDelete.end() && isEndOfParagraph(visibleEnd))) {
+            (m_downstreamEnd == m_selectionToDelete.end() && isEndOfParagraph(visibleEnd) && !m_downstreamEnd.node()->hasTagName(brTag))) {
             NodeImpl *block = createDefaultParagraphElement(document());
             insertNodeBefore(block, m_upstreamStart.node());
             addBlockPlaceholderIfNeeded(block);
@@ -347,16 +347,11 @@
     // If the entire start block is selected, and the selection does not extend to the end of the 
     // end of a block other than the block containing the selection start, then do not delete the 
     // start block, otherwise delete the start block.
-    // A similar case is provided to cover selections starting in BR elements.
     if (startOffset == 1 && m_startNode && m_startNode->hasTagName(brTag)) {
         setStartNode(m_startNode->traverseNextNode());
         startOffset = 0;
     }
-    if (m_startBlock != m_endBlock && startOffset == 0 && m_startNode && m_startNode->hasTagName(brTag) && endAtEndOfBlock) {
-        // Don't delete the BR element
-        setStartNode(m_startNode->traverseNextNode());
-    }
-    else if (m_startBlock != m_endBlock && isStartOfBlock(VisiblePosition(m_upstreamStart, m_selectionToDelete.startAffinity()))) {
+    if (m_startBlock != m_endBlock && isStartOfBlock(VisiblePosition(m_upstreamStart, m_selectionToDelete.startAffinity()))) {
         if (!m_startBlock->isAncestor(m_endBlock) && !isStartOfBlock(visibleEnd) && endAtEndOfBlock) {
             // Delete all the children of the block, but not the block itself.
             setStartNode(m_startBlock->firstChild());