Changeset 20127 in webkit

Timestamp:

Mar 12, 2007 4:57:56 PM (17 years ago)

Author:

antti

Message:

LayoutTests:

Reviewed by Alexey

Test that this works correctly with composed characters
​http://bugs.webkit.org/show_bug.cgi?id=12833
REGRESSION: Selecting text in 6.6MB txt file is sluggish as of the Feb 19th nightly
<rdar://problem/5028159>

• fast/text/large-text-composed-char-expected.checksum: Added.
• fast/text/large-text-composed-char-expected.png: Added.
• fast/text/large-text-composed-char-expected.txt: Added.
• fast/text/large-text-composed-char.html: Added.

WebCore:

Reviewed by Alexey.

Fix ​http://bugs.webkit.org/show_bug.cgi?id=12833
REGRESSION: Selecting text in 6.6MB txt file is sluggish as of the Feb 19th nightly
<rdar://problem/5028159>

Divide large text blocks (>64kB) over multiple text nodes. This limits linebox searches to
a manageable subset.

• dom/Text.cpp: (WebCore::Text::createWithLengthLimit):
• dom/Text.h:
• html/HTMLParser.cpp: (WebCore::HTMLParser::parseToken):
• loader/TextDocument.cpp: (WebCore::TextTokenizer::write):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/large-text-composed-char-expected.checksum (added)
• LayoutTests/fast/text/large-text-composed-char-expected.png (added)
• LayoutTests/fast/text/large-text-composed-char-expected.txt (added)
• LayoutTests/fast/text/large-text-composed-char.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Text.cpp (modified) (2 diffs)
• WebCore/dom/Text.h (modified) (2 diffs)
• WebCore/html/HTMLParser.cpp (modified) (1 diff)
• WebCore/loader/TextDocument.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-03-12  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Alexey
+        
+        Test that this works correctly with composed characters
+        http://bugs.webkit.org/show_bug.cgi?id=12833
+        REGRESSION: Selecting text in 6.6MB txt file is sluggish as of the Feb 19th nightly
+        <rdar://problem/5028159>
+
+        * fast/text/large-text-composed-char-expected.checksum: Added.
+        * fast/text/large-text-composed-char-expected.png: Added.
+        * fast/text/large-text-composed-char-expected.txt: Added.
+        * fast/text/large-text-composed-char.html: Added.
+
 2007-03-09  Rob Buis  <buis@kde.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-12  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Alexey.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=12833
+        REGRESSION: Selecting text in 6.6MB txt file is sluggish as of the Feb 19th nightly
+        <rdar://problem/5028159>
+        
+        Divide large text blocks (>64kB) over multiple text nodes. This limits linebox searches to
+        a manageable subset.
+        
+        * dom/Text.cpp:
+        (WebCore::Text::createWithLengthLimit):
+        * dom/Text.h:
+        * html/HTMLParser.cpp:
+        (WebCore::HTMLParser::parseToken):
+        * loader/TextDocument.cpp:
+        (WebCore::TextTokenizer::write):
+
 2007-03-12  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/dom/Text.cpp

@@ -28 +28 @@
 #include "ExceptionCode.h"
 #include "RenderText.h"
+#include "TextBreakIterator.h"
 
 #if ENABLE(SVG)
@@ -197 +198 @@
 }
 
+PassRefPtr<Text> Text::createWithLengthLimit(Document* doc, const String& text, unsigned& charsLeft, unsigned maxChars)
+{
+    if (charsLeft == text.length() && charsLeft <= maxChars) {
+        charsLeft = 0;
+        return new Text(doc, text);
+    }
+    
+    unsigned start = text.length() - charsLeft;
+    unsigned end = start + std::min(charsLeft, maxChars);
+    
+    // check we are not on an unbreakable boundary
+    TextBreakIterator* it = characterBreakIterator(text.characters(), text.length());
+    if (end < text.length() && !isTextBreak(it, end))
+        end = textBreakPreceding(it, end);
+        
+    String nodeText = text.substring(start, end - start);
+    charsLeft = text.length() - end;
+        
+    return new Text(doc, nodeText);
+}
+
 #ifndef NDEBUG
 void Text::formatForDebugger(char *buffer, unsigned length) const

trunk/WebCore/dom/Text.h

@@ -29 +29 @@
 
 namespace WebCore {
+    
+const unsigned cTextNodeLengthLimit = 1 << 16;
 
 class Text : public CharacterData
@@ -57 +59 @@
 
     virtual String toString() const;
+    
+    static PassRefPtr<Text> createWithLengthLimit(Document*, const String&, unsigned& charsLeft, unsigned maxChars = cTextNodeLengthLimit);
 
 #ifndef NDEBUG

trunk/WebCore/html/HTMLParser.cpp

@@ -196 +196 @@
             current->localName() != scriptTag && !t->text->containsOnlyWhitespace()) 
             haveContent = true;
+        
+        RefPtr<Node> n;
+        String text = t->text.get();
+        unsigned charsLeft = text.length();
+        while (charsLeft) {
+            // split large blocks of text to nodes of manageable size
+            n = Text::createWithLengthLimit(document, text, charsLeft);
+            if (!insertNode(n.get(), t->flat))
+                return 0;
+        }
+        return n;
     }
 

trunk/WebCore/loader/TextDocument.cpp

@@ -128 +128 @@
     
     String string = String(m_buffer, m_dest - m_buffer);
-    
-    RefPtr<Text> text = m_doc->createTextNode(string);
-    m_preElement->appendChild(text, ec);
+    unsigned charsLeft = string.length();
+    while (charsLeft) {
+        // split large text to nodes of manageable size
+        RefPtr<Text> text = Text::createWithLengthLimit(m_doc, string, charsLeft);
+        m_preElement->appendChild(text, ec);
+    }
 
     return false;