Changeset 52235 in webkit

Timestamp:

Dec 16, 2009 10:30:20 PM (14 years ago)

Author:

hamaji@chromium.org

Message:

2009-12-15 MORITA Hajime <​morrita@gmail.com>

Reviewed by Eric Seidel.

Bug 28306: double-clicking a word inside <b> beside newline select two words
​https://bugs.webkit.org/show_bug.cgi?id=28306

SimplifiedBackwardsTextIterator missed trailing whitespaces just
before folding line-break, which is used to detect word
boundaries. This fix checks strings on RenderText and expand text
range on SimplifiedBackwardsTextIterator to include trailing
whitespaces if availble.

Test: editing/selection/doubleclick-beside-cr-span.html

• editing/TextIterator.cpp: (WebCore::collapsedSpaceLength): (WebCore::maxOffsetIncludingCollapsedSpaces): (WebCore::SimplifiedBackwardsTextIterator::advance):

2009-12-16 MORITA Hajime <​morrita@gmail.com>

Reviewed by Eric Seidel.

Bug 28306: double-clicking a word inside <b> beside newline select two words
​https://bugs.webkit.org/show_bug.cgi?id=28306

SimplifiedBackwardsTextIterator missed trailing whitespaces just
before folding line-break, which is used to detect word
boundaries. This fix checks strings on RenderText and expand text
range on SimplifiedBackwardsTextIterator to include trailing
whitespaces if availble.

• editing/selection/doubleclick-beside-cr-span-expected.txt: Added.
• editing/selection/doubleclick-beside-cr-span.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/doubleclick-beside-cr-span-expected.txt (added)
• LayoutTests/editing/selection/doubleclick-beside-cr-span.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/TextIterator.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-16  MORITA Hajime <morrita@gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        Bug 28306: double-clicking a word inside <b> beside newline select two words
+        https://bugs.webkit.org/show_bug.cgi?id=28306
+
+        SimplifiedBackwardsTextIterator missed trailing whitespaces just
+        before folding line-break, which is used to detect word
+        boundaries. This fix checks strings on RenderText and expand text
+        range on SimplifiedBackwardsTextIterator to include trailing
+        whitespaces if availble.
+
+        * editing/selection/doubleclick-beside-cr-span-expected.txt: Added.
+        * editing/selection/doubleclick-beside-cr-span.html: Added.
+
 2009-12-16  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-15 MORITA Hajime <morrita@gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        Bug 28306: double-clicking a word inside <b> beside newline select two words
+        https://bugs.webkit.org/show_bug.cgi?id=28306
+        
+        SimplifiedBackwardsTextIterator missed trailing whitespaces just
+        before folding line-break, which is used to detect word
+        boundaries. This fix checks strings on RenderText and expand text
+        range on SimplifiedBackwardsTextIterator to include trailing
+        whitespaces if availble.
+
+        Test: editing/selection/doubleclick-beside-cr-span.html
+
+        * editing/TextIterator.cpp:
+        (WebCore::collapsedSpaceLength):
+        (WebCore::maxOffsetIncludingCollapsedSpaces):
+        (WebCore::SimplifiedBackwardsTextIterator::advance):
+
 2009-12-16  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebCore/editing/TextIterator.cpp

@@ -704 +704 @@
     
     return false;
+}
+
+static int collapsedSpaceLength(RenderText* renderer, int textEnd)
+{
+    const UChar* characters = renderer->text()->characters();
+    int length = renderer->text()->length();
+    for (int i = textEnd; i < length; ++i) {
+        if (!renderer->style()->isCollapsibleWhiteSpace(characters[i]))
+            return i - textEnd;
+    }
+
+    return length - textEnd;
+}
+
+static int maxOffsetIncludingCollapsedSpaces(Node* node)
+{
+    int offset = caretMaxOffset(node);
+
+    if (node->renderer() && node->renderer()->isText())
+        offset += collapsedSpaceLength(toRenderText(node->renderer()), offset);
+
+    return offset;
 }
 
@@ -1030 +1052 @@
         if (m_node)
             pushFullyClippedState(m_fullyClippedStack, m_node);
-        m_offset = m_node ? caretMaxOffset(m_node) : 0;
+        // For the purpose of word boundary detection,
+        // we should iterate all visible text and trailing (collapsed) whitespaces. 
+        m_offset = m_node ? maxOffsetIncludingCollapsedSpaces(m_node) : 0;
         m_handledNode = false;
         m_handledChildren = false;