Changeset 19441 in webkit

Timestamp:

Feb 6, 2007 2:17:20 PM (17 years ago)

Author:

justing

Message:

LayoutTests:

Reviewed by john

<rdar://problem/4959067>
Bullets get erased or moved down to another line
<rdar://problem/4912529>
Seed: Bulleted list in Note in Mail.app does not work with Japanese input mode

• editing/inserting/4959067-expected.checksum: Added.
• editing/inserting/4959067-expected.png: Added.
• editing/inserting/4959067-expected.txt: Added.
• editing/inserting/4959067.html: Added.

WebCore:

Reviewed by john

<rdar://problem/4959067>
Bullets get erased or moved down to another line
<rdar://problem/4912529>
Seed: Bulleted list in Note in Mail.app does not work with Japanese input mode

Do not expand the selection to include fully selected
special elements when insering text over a selection.

• editing/CompositeEditCommand.cpp: (WebCore::CompositeEditCommand::deleteSelection): Pass expandForSpecialElements through to DeleteSelectionCommand's constructor. (WebCore::CompositeEditCommand::moveParagraphs): Use the convenience function.
• editing/CompositeEditCommand.h:
• editing/DeleteSelectionCommand.h:
• editing/InsertTextCommand.cpp: (WebCore::InsertTextCommand::input): Do not expand the selection to be deleted for special elements.
• editing/ReplaceSelectionCommand.cpp: (WebCore::ReplaceSelectionCommand::doApply): Added a FIXME about when we should expand the selection.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/4959067-expected.checksum (added)
• LayoutTests/editing/inserting/4959067-expected.png (added)
• LayoutTests/editing/inserting/4959067-expected.txt (added)
• LayoutTests/editing/inserting/4959067.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/CompositeEditCommand.cpp (modified) (2 diffs)
• WebCore/editing/CompositeEditCommand.h (modified) (1 diff)
• WebCore/editing/DeleteSelectionCommand.h (modified) (1 diff)
• WebCore/editing/InsertTextCommand.cpp (modified) (1 diff)
• WebCore/editing/ReplaceSelectionCommand.cpp (modified) (1 diff)
• WebCore/editing/htmlediting.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-02-06  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by john
+
+        <rdar://problem/4959067>
+        Bullets get erased or moved down to another line
+        <rdar://problem/4912529>
+        Seed: Bulleted list in Note in Mail.app does not work with Japanese input mode
+
+        * editing/inserting/4959067-expected.checksum: Added.
+        * editing/inserting/4959067-expected.png: Added.
+        * editing/inserting/4959067-expected.txt: Added.
+        * editing/inserting/4959067.html: Added.
+
 2007-02-06  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-05  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by john
+
+        <rdar://problem/4959067>
+        Bullets get erased or moved down to another line
+        <rdar://problem/4912529>
+        Seed: Bulleted list in Note in Mail.app does not work with Japanese input mode
+        
+        Do not expand the selection to include fully selected 
+        special elements when insering text over a selection.
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::deleteSelection): Pass
+        expandForSpecialElements through to DeleteSelectionCommand's constructor.
+        (WebCore::CompositeEditCommand::moveParagraphs): Use the 
+        convenience function.
+        * editing/CompositeEditCommand.h:
+        * editing/DeleteSelectionCommand.h:
+        * editing/InsertTextCommand.cpp:
+        (WebCore::InsertTextCommand::input): Do not expand the selection
+        to be deleted for special elements.
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::doApply): Added a FIXME about 
+        when we should expand the selection.
+
 2007-02-06  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/editing/CompositeEditCommand.cpp

@@ -300 +300 @@
 }
 
-void CompositeEditCommand::deleteSelection(bool smartDelete, bool mergeBlocksAfterDelete, bool replace)
+void CompositeEditCommand::deleteSelection(bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements)
 {
     if (endingSelection().isRange())
-        applyCommandToComposite(new DeleteSelectionCommand(document(), smartDelete, mergeBlocksAfterDelete, replace));
-}
-
-void CompositeEditCommand::deleteSelection(const Selection &selection, bool smartDelete, bool mergeBlocksAfterDelete, bool replace)
+        applyCommandToComposite(new DeleteSelectionCommand(document(), smartDelete, mergeBlocksAfterDelete, replace, expandForSpecialElements));
+}
+
+void CompositeEditCommand::deleteSelection(const Selection &selection, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements)
 {
     if (selection.isRange())
-        applyCommandToComposite(new DeleteSelectionCommand(selection, smartDelete, mergeBlocksAfterDelete, replace));
+        applyCommandToComposite(new DeleteSelectionCommand(selection, smartDelete, mergeBlocksAfterDelete, replace, expandForSpecialElements));
 }
 
@@ -746 +746 @@
     
     setEndingSelection(Selection(start, end, DOWNSTREAM));
-    applyCommandToComposite(new DeleteSelectionCommand(document(), false, false, false, false));
+    deleteSelection(false, false, false, false);
 
     ASSERT(destination.deepEquivalent().node()->inDocument());

trunk/WebCore/editing/CompositeEditCommand.h

@@ -52 +52 @@
     void removeStyledElement(Element*);
     void deleteKeyPressed();
-    void deleteSelection(bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false);
-    void deleteSelection(const Selection&, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false);
+    void deleteSelection(bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = true);
+    void deleteSelection(const Selection&, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = true);
     virtual void deleteTextFromNode(Text* node, int offset, int count);
     void inputText(const String&, bool selectInsertedText = false);

trunk/WebCore/editing/DeleteSelectionCommand.h

@@ -33 +33 @@
 class DeleteSelectionCommand : public CompositeEditCommand { 
 public:
-    DeleteSelectionCommand(Document*, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = true);
-    DeleteSelectionCommand(const Selection&, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = true);
+    DeleteSelectionCommand(Document*, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = false);
+    DeleteSelectionCommand(const Selection&, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = false);
 
     virtual void doApply();

trunk/WebCore/editing/InsertTextCommand.cpp

@@ -102 +102 @@
     // Delete the current selection.
     if (endingSelection().isRange())
-        deleteSelection(false, true, true);
+        deleteSelection(false, true, true, false);
     
     // Insert the character at the leftmost candidate.

trunk/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -509 +509 @@
         // will leave hanging block(s).
         bool mergeBlocksAfterDelete = isEndOfParagraph(visibleEnd) || isStartOfBlock(visibleStart);
+        // FIXME: We should only expand to include fully selected special elements if we are copying a 
+        // selection and pasting it on top of itself.
         deleteSelection(false, mergeBlocksAfterDelete, true);
         visibleStart = endingSelection().visibleStart();

trunk/WebCore/editing/htmlediting.cpp

@@ -305 +305 @@
     
     if (pos.offset() <= 0) {
-        if (node->parentNode() && (node->hasTagName(brTag) || editingIgnoresContent(node)))
+        if (node->parentNode() && (node->hasTagName(brTag) || editingIgnoresContent(node)) || isTableElement(node))
             return positionBeforeNode(node);
         return Position(node, 0);
@@ -328 +328 @@
         return node->parentNode() ? positionBeforeNode(node) : Position(node, 0);
     }
+    
+    if (pos.offset() == maxCompliantOffset && (editingIgnoresContent(node) || isTableElement(node)))
+        return positionAfterNode(node);
     
     return Position(pos);