LayoutTests/ChangeLog

2010-12-16  Benjamin Kalman  <kalman@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Moving or selecting backwards by words jumps to start of contenteditable region if contenteditable=false span is encountered

        https://bugs.webkit.org/show_bug.cgi?id=51001

        Test that moving the selection back by a word over a non-contenteditable span only moves

        back a word (as opposed to currently where the selection moves to the start of the parent

        contenteditable div).

        * editing/selection/extend-backward-by-word-over-non-editable-expected.txt: Added.

        * editing/selection/extend-backward-by-word-over-non-editable.html: Added.

2010-12-14  Brady Eidson  <beidson@apple.com>

        Reviewed by Alexey Proskuryakov.

LayoutTests/editing/selection/extend-backward-by-word-over-non-editable-expected.txt

Tests that extending backwards over a non-contenteditable word only extends over that word

Dump of markup 1:

| "foo bar <#selection-focus>"

| <span>

|   contenteditable="false"

|   "baz"

| "<#selection-anchor> qux quux"

Dump of markup 2:

| "PASS"

LayoutTests/editing/selection/extend-backward-by-word-over-non-editable.html

<!DOCTYPE html>

<div id="textContainer" contenteditable>foo bar <span contenteditable=false>baz</span> qux quux</div>

<div id="result">FAIL</div>

<script src="../../resources/dump-as-markup.js"></script>

<script>

    textContainer = document.getElementById("textContainer");

    result = document.getElementById("result");

    // Place cursor after "baz".

    getSelection().setBaseAndExtent(textContainer.childNodes[2], 0);

    // Extend selection backwards by a word; "baz" should be selected.

    getSelection().modify("extend", "backward", "word");

    if (getSelection().toString() === "baz")

        document.getElementById("result").innerHTML = "PASS";

    Markup.description("Tests that extending backwards over a non-contenteditable word only extends over that word");

    Markup.dump(textContainer);

    Markup.dump(result);

</script>

WebCore/ChangeLog

2010-12-16  Benjamin Kalman  <kalman@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Moving or selecting backwards by words jumps to start of contenteditable region if contenteditable=false span is encountered

        https://bugs.webkit.org/show_bug.cgi?id=51001

        Revert part of changeset 64974 (bugs.webkit.org/b/36359) which caused this regression by

        removing references to TextIteratorEndsAtEditingBoundary.

        Add an alternative fix which ensures that the rightmost equivalent Position is used to

        create the VisiblePosition returned from previousBoundary.

        Test: editing/selection/extend-backward-by-word-over-non-editable.html

        * editing/TextIterator.cpp:

        (WebCore::TextIterator::TextIterator): Remove references to TextIteratorEndsAtEditingBoundary

        (WebCore::SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator):

        (WebCore::SimplifiedBackwardsTextIterator::advance):

        (WebCore::SimplifiedBackwardsTextIterator::setNodeIfNotNull):

        * editing/TextIterator.h: Remove TextIteratorEndsAtEditingBoundary

        * editing/visible_units.cpp: 

        (WebCore::rightmostEquivalent):

        (WebCore::previousBoundary): Use the rightmost equivalent Position for the returned VisiblePosition

2010-12-14  Brady Eidson  <beidson@apple.com>

        Reviewed by Alexey Proskuryakov.

WebCore/editing/TextIterator.cpp

@@TextIterator::TextIterator(const Range* r, TextIteratorBehavior behavior)

    , m_handledFirstLetter(false)

    , m_ignoresStyleVisibility(behavior & TextIteratorIgnoresStyleVisibility)

{

    // FIXME: should support TextIteratorEndsAtEditingBoundary http://webkit.org/b/43609

    ASSERT(behavior != TextIteratorEndsAtEditingBoundary);

    if (!r)

        return;

@@SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator(const Range* r,

    , m_node(0)

    , m_positionNode(0)

{

1054 ASSERT(m_behavior == TextIteratorDefaultBehavior ~~|| m_behavior == TextIteratorEndsAtEditingBoundary~~);

1051 ASSERT(m_behavior == TextIteratorDefaultBehavior);

    if (!r)

        return;

@@SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator(const Range* r,

        }

    }

1079 ~~setCurrentN~~ode(endNode);

1076 m_node = endNode;

    setUpFullyClippedStack(m_fullyClippedStack, m_node);    

    m_offset = endOffset;

    m_handledNode = false;

@@void SimplifiedBackwardsTextIterator::advance()

            }

            // Exit all other containers.

            while (!m_node->previousSibling()) {

1144 if (!set~~Current~~Node(m_node->parentOrHostNode()))

1141 if (!setNodeIfNotNull(m_node->parentOrHostNode()))

                    break;

                m_fullyClippedStack.pop();

                exitNode();

@@void SimplifiedBackwardsTextIterator::advance()

            m_fullyClippedStack.pop();

        }

1159 if (m_node && set~~Current~~Node(next))

1156 if (m_node && setNodeIfNotNull(next))

            pushFullyClippedState(m_fullyClippedStack, m_node);

        else

            clearCurrentNode();

@@void SimplifiedBackwardsTextIterator::emitCharacter(UChar c, Node* node, int sta

    m_lastCharacter = c;

}

bool SimplifiedBackwardsTextIterator::crossesEditingBoundary(Node* node) const

{

    return m_node && m_node->isContentEditable() != node->isContentEditable();

}

bool SimplifiedBackwardsTextIterator::setCurrentNode(Node* node)

1239bool SimplifiedBackwardsTextIterator::setNodeIfNotNull(Node* node)

{

    if (!node)

        return false;

1251 if (m_behavior == TextIteratorEndsAtEditingBoundary && crossesEditingBoundary(node))

1252 return false;

    m_node = node;

    return true;

}

WebCore/editing/TextIterator.h

@@enum TextIteratorBehavior {

    TextIteratorEmitsCharactersBetweenAllVisiblePositions = 1 << 0,

    TextIteratorEntersTextControls = 1 << 1,

    TextIteratorEmitsTextsWithoutTranscoding = 1 << 2,

44 TextIteratorEndsAtEditingBoundary = 1 << 3,

45 TextIteratorIgnoresStyleVisibility = 1 << 4

44 TextIteratorIgnoresStyleVisibility = 1 << 3

4645};

47

46

// FIXME: Can't really answer this question correctly without knowing the white-space mode.

// FIXME: Move this somewhere else in the editing directory. It doesn't belong here.

inline bool isCollapsibleWhitespace(UChar c)

@@private:

    bool handleReplacedElement();

    bool handleNonTextNode();

    void emitCharacter(UChar, Node*, int startOffset, int endOffset);

208 bool crossesEditingBoundary(Node*) const;

209 bool setCurrentNode(Node*);

207 bool setNodeIfNotNull(Node*);

    void clearCurrentNode();

    TextIteratorBehavior m_behavior;

WebCore/editing/visible_units.cpp

@@enum BoundarySearchContextAvailability { DontHaveMoreContext, MayHaveMoreContext

typedef unsigned (*BoundarySearchFunction)(const UChar*, unsigned length, unsigned offset, BoundarySearchContextAvailability, bool& needMoreContext);

static Position rightmostEquivalent(Position p)

{

    Position next = p.next();

    while (p.node() != next.node()) {

        p = next;

        next = p.next();

    }

    return p;

}

static VisiblePosition previousBoundary(const VisiblePosition& c, BoundarySearchFunction searchFunction)

{

    Position pos = c.deepEquivalent();

@@static VisiblePosition previousBoundary(const VisiblePosition& c, BoundarySearch

    if (ec)

        return VisiblePosition();

92 SimplifiedBackwardsTextIterator it(searchRange.get()~~, TextIteratorEndsAtEditingBoundary~~);

102 SimplifiedBackwardsTextIterator it(searchRange.get());

    unsigned next = 0;

    bool inTextSecurityMode = start.node() && start.node()->renderer() && start.node()->renderer()->style()->textSecurity() != TSNONE;

    bool needMoreContext = false;

@@static VisiblePosition previousBoundary(const VisiblePosition& c, BoundarySearch

        ASSERT(!needMoreContext);

    }

    if (it.atEnd() && next == 0) {

        pos = it.range()->startPosition();

    } else if (next != 0) {

    if (it.atEnd() && !next)

        pos = it.range().get()->startPosition();

    else if (next) {

        Node *node = it.range()->startContainer(ec);

        if ((node->isTextNode() && static_cast<int>(next) <= node->maxCharacterOffset()) || (node->renderer() && node->renderer()->isBR() && !next))

            // The next variable contains a usable index into a text node

            pos = Position(node, next);

        else {

            // Use the character iterator to translate the next value into a DOM position.

127 BackwardsCharacterIterator charIt(searchRange.get()~~, TextIteratorEndsAtEditingBoundary~~);

137 BackwardsCharacterIterator charIt(searchRange.get());

128138 charIt.advance(string.size() - suffixLength - next);

129 pos = charIt.range()->endPosition();

139 // Take the rightmost equivalent position so that the correct containing editable region is used if a boundary is reached.

140 pos = rightmostEquivalent(charIt.range()->endPosition());

        }

    }