Changeset 84326 in webkit


Ignore:
Timestamp:
Apr 19, 2011, 6:18:03 PM (14 years ago)
Author:
rniwa@webkit.org
Message:

2011-04-19 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Remove calls to deprecatedOffset and deprecatedNode in TypingCommand
https://bugs.webkit.org/show_bug.cgi?id=58569

Removed all calls to deprecatedOffset and deprecatedNode.

  • editing/TypingCommand.cpp: (WebCore::TypingCommand::insertText): (WebCore::TypingCommand::deleteKeyPressed): (WebCore::TypingCommand::forwardDeleteKeyPressed):
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r84323 r84326  
     12011-04-19  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Remove calls to deprecatedOffset and deprecatedNode in TypingCommand
     6        https://bugs.webkit.org/show_bug.cgi?id=58569
     7
     8        Removed all calls to deprecatedOffset and deprecatedNode.
     9
     10        * editing/TypingCommand.cpp:
     11        (WebCore::TypingCommand::insertText):
     12        (WebCore::TypingCommand::deleteKeyPressed):
     13        (WebCore::TypingCommand::forwardDeleteKeyPressed):
     14
    1152011-04-19  Adrienne Walker  <enne@google.com>
    216
  • trunk/Source/WebCore/editing/TypingCommand.cpp

    r83492 r84326  
    173173    bool changeSelection = currentSelection != selectionForInsertion;
    174174    String newText = text;
    175     Node* startNode = selectionForInsertion.start().deprecatedNode();
    176    
    177     if (startNode && startNode->rootEditableElement() && compositionType != TextCompositionUpdate) {
    178         // Send BeforeTextInsertedEvent. The event handler will update text if necessary.
    179         ExceptionCode ec = 0;
    180         RefPtr<BeforeTextInsertedEvent> evt = BeforeTextInsertedEvent::create(text);
    181         startNode->rootEditableElement()->dispatchEvent(evt, ec);
    182         newText = evt->text();
     175    if (Node* startNode = selectionForInsertion.start().containerNode()) {
     176        if (startNode->rootEditableElement() && compositionType != TextCompositionUpdate) {
     177            // Send BeforeTextInsertedEvent. The event handler will update text if necessary.
     178            ExceptionCode ec = 0;
     179            RefPtr<BeforeTextInsertedEvent> evt = BeforeTextInsertedEvent::create(text);
     180            startNode->rootEditableElement()->dispatchEvent(evt, ec);
     181            newText = evt->text();
     182        }
    183183    }
    184184   
     
    507507        VisiblePosition visibleStart(endingSelection().visibleStart());
    508508        // If we have a caret selection on an empty cell, we have nothing to do.
    509         if (isEmptyTableCell(visibleStart.deepEquivalent().deprecatedNode()))
     509        if (isEmptyTableCell(visibleStart.deepEquivalent().containerNode()))
    510510            return;
    511511
     
    526526        selectionToDelete = selection.selection();
    527527
    528         if (granularity == CharacterGranularity && selectionToDelete.end().deprecatedNode() == selectionToDelete.start().deprecatedNode() && selectionToDelete.end().deprecatedEditingOffset() - selectionToDelete.start().deprecatedEditingOffset() > 1) {
     528        if (granularity == CharacterGranularity && selectionToDelete.end().containerNode() == selectionToDelete.start().containerNode()
     529            && selectionToDelete.end().computeOffsetInContainerNode() - selectionToDelete.start().computeOffsetInContainerNode() > 1) {
    529530            // If there are multiple Unicode code points to be deleted, adjust the range to match platform conventions.
    530531            selectionToDelete.setWithoutValidation(selectionToDelete.end(), selectionToDelete.end().previous(BackwardDeletion));
     
    593594            downstreamEnd = visibleEnd.next(CannotCrossEditingBoundary).deepEquivalent().downstream();
    594595        // When deleting tables: Select the table first, then perform the deletion
    595         if (downstreamEnd.deprecatedNode() && downstreamEnd.deprecatedNode()->renderer() && downstreamEnd.deprecatedNode()->renderer()->isTable() && !downstreamEnd.deprecatedEditingOffset()) {
    596             setEndingSelection(VisibleSelection(endingSelection().end(), positionAfterNode(downstreamEnd.deprecatedNode()), DOWNSTREAM));
     596        if (downstreamEnd.containerNode() && downstreamEnd.containerNode()->renderer() && downstreamEnd.containerNode()->renderer()->isTable()
     597            && downstreamEnd.computeOffsetInContainerNode() <= caretMinOffset(downstreamEnd.containerNode())) {
     598            setEndingSelection(VisibleSelection(endingSelection().end(), positionAfterNode(downstreamEnd.containerNode()), DOWNSTREAM));
    597599            typingAddedToOpenCommand(ForwardDeleteKey);
    598600            return;
     
    611613            // the current state of the document and we'll get the wrong result.
    612614            Position extent = startingSelection().end();
    613             if (extent.deprecatedNode() != selectionToDelete.end().deprecatedNode())
     615            if (extent.containerNode() != selectionToDelete.end().containerNode())
    614616                extent = selectionToDelete.extent();
    615617            else {
    616618                int extraCharacters;
    617                 if (selectionToDelete.start().deprecatedNode() == selectionToDelete.end().deprecatedNode())
    618                     extraCharacters = selectionToDelete.end().deprecatedEditingOffset() - selectionToDelete.start().deprecatedEditingOffset();
     619                if (selectionToDelete.start().containerNode() == selectionToDelete.end().containerNode())
     620                    extraCharacters = selectionToDelete.end().computeOffsetInContainerNode() - selectionToDelete.start().computeOffsetInContainerNode();
    619621                else
    620                     extraCharacters = selectionToDelete.end().deprecatedEditingOffset();
    621                 extent = Position(extent.deprecatedNode(), extent.deprecatedEditingOffset() + extraCharacters, Position::PositionIsOffsetInAnchor);
     622                    extraCharacters = selectionToDelete.end().computeOffsetInContainerNode();
     623                extent = Position(extent.containerNode(), extent.computeOffsetInContainerNode() + extraCharacters, Position::PositionIsOffsetInAnchor);
    622624            }
    623625            selectionAfterUndo.setWithoutValidation(startingSelection().start(), extent);
Note: See TracChangeset for help on using the changeset viewer.