diff options
Diffstat (limited to 'WebCore/editing/ReplaceSelectionCommand.h')
| -rw-r--r-- | WebCore/editing/ReplaceSelectionCommand.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/WebCore/editing/ReplaceSelectionCommand.h b/WebCore/editing/ReplaceSelectionCommand.h index dc669a3..18dffa5 100644 --- a/WebCore/editing/ReplaceSelectionCommand.h +++ b/WebCore/editing/ReplaceSelectionCommand.h @@ -50,17 +50,19 @@ private: void completeHTMLReplacement(const Position& lastPositionToSelect); - void insertNodeAfterAndUpdateNodesInserted(Node* insertChild, Node* refChild); - void insertNodeAtAndUpdateNodesInserted(Node*, const Position&); - void insertNodeBeforeAndUpdateNodesInserted(Node* insertChild, Node* refChild); + void insertNodeAfterAndUpdateNodesInserted(PassRefPtr<Node> insertChild, Node* refChild); + void insertNodeAtAndUpdateNodesInserted(PassRefPtr<Node>, const Position&); + void insertNodeBeforeAndUpdateNodesInserted(PassRefPtr<Node> insertChild, Node* refChild); void updateNodesInserted(Node*); bool shouldRemoveEndBR(Node*, const VisiblePosition&); bool shouldMergeStart(bool, bool); - bool shouldMergeEnd(bool); + bool shouldMergeEnd(bool selectEndWasEndOfParagraph); bool shouldMerge(const VisiblePosition&, const VisiblePosition&); + void mergeEndIfNeeded(); + void removeUnrenderedTextNodesAtEnds(); void negateStyleRulesThatAffectAppearance(); @@ -83,6 +85,7 @@ private: bool m_preventNesting; bool m_movingParagraph; EditAction m_editAction; + bool m_shouldMergeEnd; }; } // namespace WebCore |