LayoutTests:

        Reviewed by Darin.

        <rdar://problem/4813973> Pressing delete key to remove empty quoted line leaves cursor mis-positioned

        * editing/deleting/delete-br-012-expected.checksum: Added.
        * editing/deleting/delete-br-012-expected.png: Added.
        * editing/deleting/delete-br-012-expected.txt: Added.
        * editing/deleting/delete-br-012.html: Added.

WebCore:

        Reviewed by Darin.

        <rdar://problem/4813973> Pressing delete key to remove empty quoted line leaves cursor mis-positioned

        Test:
        * editing/deleting/delete-br-012.html
        
        * editing/DeleteSelectionCommand.cpp:
        (WebCore::DeleteSelectionCommand::handleSpecialCaseBRDelete):
        Update m_endingPosition when preventing merge.
        Also removed setting of m_mergeBlocksAfterDelete when this function returns true, because is is not checked in this case.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17621 268f45cc-cd09-0410-ab3c-d52691b4dbfc
7 files changed