Changeset 165002 in webkit

Timestamp:

Mar 3, 2014, 1:11:24 PM (11 years ago)

Author:

Antti Koivisto

Message:

Find results on simple lines are not marked correctly
​https://bugs.webkit.org/show_bug.cgi?id=129586

Reviewed by Andreas Kling.

Source/WebCore:

Tests: editing/text-iterator/count-mark-lineboxes.html

editing/text-iterator/count-mark-simple-lines.html

TextIterator operating on simple lines failed to take the end of the range into account.
This also causes performance issues on long documents as range traversals would miss the end
node and end up going through the entire document.

• editing/TextIterator.cpp:

(WebCore::TextIterator::handleTextNode):

Stop when hitting the range end on simple text nodes.

(WebCore::SimplifiedBackwardsTextIterator::handleTextNode):

Use hasRenderedText test instead of linebox-only firstTextBox.

• testing/Internals.cpp:

(WebCore::Internals::countMatchesForText):

• testing/Internals.h:
• testing/Internals.idl:

Add testing interface for counting and marking matches.

LayoutTests:

• editing/text-iterator/count-mark-lineboxes-expected.txt: Added.
• editing/text-iterator/count-mark-lineboxes.html: Added.
• editing/text-iterator/count-mark-simple-lines-expected.txt: Added.
• editing/text-iterator/count-mark-simple-lines.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/text-iterator/count-mark-lineboxes-expected.txt (added)
• LayoutTests/editing/text-iterator/count-mark-lineboxes.html (added)
• LayoutTests/editing/text-iterator/count-mark-simple-lines-expected.txt (added)
• LayoutTests/editing/text-iterator/count-mark-simple-lines.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/TextIterator.cpp (modified) (3 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)
• Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-03  Antti Koivisto  <antti@apple.com>
+
+        Find results on simple lines are not marked correctly
+        https://bugs.webkit.org/show_bug.cgi?id=129586
+
+        Reviewed by Andreas Kling.
+
+        * editing/text-iterator/count-mark-lineboxes-expected.txt: Added.
+        * editing/text-iterator/count-mark-lineboxes.html: Added.
+        * editing/text-iterator/count-mark-simple-lines-expected.txt: Added.
+        * editing/text-iterator/count-mark-simple-lines.html: Added.
+
 2014-03-03  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-03  Antti Koivisto  <antti@apple.com>
+
+        Find results on simple lines are not marked correctly
+        https://bugs.webkit.org/show_bug.cgi?id=129586
+
+        Reviewed by Andreas Kling.
+
+        Tests: editing/text-iterator/count-mark-lineboxes.html
+               editing/text-iterator/count-mark-simple-lines.html
+               
+        TextIterator operating on simple lines failed to take the end of the range into account.
+        This also causes performance issues on long documents as range traversals would miss the end
+        node and end up going through the entire document.
+
+        * editing/TextIterator.cpp:
+        (WebCore::TextIterator::handleTextNode):
+        
+            Stop when hitting the range end on simple text nodes.
+
+        (WebCore::SimplifiedBackwardsTextIterator::handleTextNode):
+        
+            Use hasRenderedText test instead of linebox-only firstTextBox.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::countMatchesForText):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+        
+            Add testing interface for counting and marking matches.
+
 2014-03-03  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -539 +539 @@
             return true;
         // This code aims to produce same results as handleTextBox() below so test results don't change. It does not make much logical sense.
+        const unsigned end = (m_node == m_endContainer) ? static_cast<unsigned>(m_endOffset) : str.length();
         unsigned runEnd = m_offset;
         unsigned runStart = m_offset;
-        while (runEnd < str.length() && (deprecatedIsCollapsibleWhitespace(str[runEnd]) || str[runEnd] == '\t'))
+        while (runEnd < end && (deprecatedIsCollapsibleWhitespace(str[runEnd]) || str[runEnd] == '\t'))
             ++runEnd;
         bool addSpaceForPrevious = m_lastTextNodeEndedWithCollapsedSpace && m_lastCharacter && !deprecatedIsCollapsibleWhitespace(m_lastCharacter);
@@ -557 +558 @@
             runStart = runEnd;
         }
-        while (runEnd < str.length() && !deprecatedIsCollapsibleWhitespace(str[runEnd]))
+        while (runEnd < end && !deprecatedIsCollapsibleWhitespace(str[runEnd]))
             ++runEnd;
-        if (runStart < str.length())
+        if (runStart < end)
             emitText(m_node, renderer, runStart, runEnd);
         m_offset = runEnd;
-        return runEnd == str.length();
+        return runEnd == end;
     }
 
@@ -1301 +1302 @@
 
     String text = renderer->text();
-    if (!renderer->firstTextBox() && text.length() > 0)
+    if (!renderer->hasRenderedText() && text.length() > 0)
         return true;
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -1436 +1436 @@
 }
 
+unsigned Internals::countMatchesForText(const String& text, unsigned findOptions, const String& markMatches, ExceptionCode&)
+{
+    Document* document = contextDocument();
+    if (!document || !document->frame())
+        return 0;
+
+    bool mark = markMatches == "mark";
+    return document->frame()->editor().countMatchesForText(text, nullptr, findOptions, std::numeric_limits<unsigned>::max(), mark, nullptr);
+}
+
 const ProfilesArray& Internals::consoleProfiles() const
 {

trunk/Source/WebCore/testing/Internals.h

@@ -188 +188 @@
     void toggleOverwriteModeEnabled(ExceptionCode&);
 
+    unsigned countMatchesForText(const String&, unsigned findOptions, const String& markMatches, ExceptionCode&);
+
     unsigned numberOfScrollableAreas(ExceptionCode&);
 

trunk/Source/WebCore/testing/Internals.idl

@@ -99 +99 @@
     [RaisesException] void setEditingValue(Element inputElement, DOMString value);
     [RaisesException] void setAutofilled(Element inputElement, boolean enabled);
+    [RaisesException] unsigned long countMatchesForText(DOMString text, unsigned long findOptions, DOMString markMatches);
 
     [RaisesException] void paintControlTints();

trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in

@@ -336 +336 @@
         symbolWithPointer(?toggleContinuousSpellChecking@Editor@WebCore@@QAEXXZ, ?toggleContinuousSpellChecking@Editor@WebCore@@QEAAXXZ)
         symbolWithPointer(?toggleOverwriteModeEnabled@Editor@WebCore@@QAEXXZ, ?toggleOverwriteModeEnabled@Editor@WebCore@@QEAAXXZ)
+        symbolWithPointer(?countMatchesForText@Editor@WebCore@@QAEIABVString@WTF@@PAVRange@2@EI_NPAV?$Vector@V?$RefPtr@VRange@WebCore@@@WTF@@$0A@VCrashOnOverflow@2@@4@@Z, ?countMatchesForText@Editor@WebCore@@QEAAIABVString@WTF@@PAVRange@2@EI_NPAV?$Vector@V?$RefPtr@VRange@WebCore@@@WTF@@$0A@VCrashOnOverflow@2@@4@@Z)
 #if ENABLE(FULLSCREEN_API)
         symbolWithPointer(?webkitWillEnterFullScreenForElement@Document@WebCore@@QAEXPAVElement@2@@Z, ?webkitWillEnterFullScreenForElement@Document@WebCore@@QEAAXPEAVElement@2@@Z)