[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 79eb8292ef78fe92c3ee834746141f723b13ad54
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 05:14:30 2011 +0000

    2011-01-06  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            REGRESSION (r74663): ASSERTION FAILED: m_tokenizer->lineNumber() == line.zeroBasedInt()
            https://bugs.webkit.org/show_bug.cgi?id=52013
    
            This test case used to trigger an ASSERT.  It's unclear to me whether
            there's a more direct way to test this fix.
    
            * fast/parser/line-number-composite-segmented-string-expected.txt: Added.
            * fast/parser/line-number-composite-segmented-string.html: Added.
    2011-01-06  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            REGRESSION (r74663): ASSERTION FAILED: m_tokenizer->lineNumber() == line.zeroBasedInt()
            https://bugs.webkit.org/show_bug.cgi?id=52013
    
            When excluding line numbers for composite strings, we forgot to exclude
            the line number for the current string!
    
            Test: fast/parser/line-number-composite-segmented-string.html
    
            * platform/text/SegmentedString.cpp:
            (WebCore::SegmentedString::setExcludeLineNumbers):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75228 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1e012d6..600b51c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-06  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION (r74663): ASSERTION FAILED: m_tokenizer->lineNumber() == line.zeroBasedInt()
+        https://bugs.webkit.org/show_bug.cgi?id=52013
+
+        This test case used to trigger an ASSERT.  It's unclear to me whether
+        there's a more direct way to test this fix.
+
+        * fast/parser/line-number-composite-segmented-string-expected.txt: Added.
+        * fast/parser/line-number-composite-segmented-string.html: Added.
+
 2011-01-06  Stephen White  <senorblanco at chromium.org>
 
         Unreviewed; chromium test expectations update.
diff --git a/LayoutTests/fast/parser/line-number-composite-segmented-string-expected.txt b/LayoutTests/fast/parser/line-number-composite-segmented-string-expected.txt
new file mode 100644
index 0000000..d801cb0
--- /dev/null
+++ b/LayoutTests/fast/parser/line-number-composite-segmented-string-expected.txt
@@ -0,0 +1 @@
+This test passes if it doesn't trigger an ASSERT.
diff --git a/LayoutTests/fast/parser/line-number-composite-segmented-string.html b/LayoutTests/fast/parser/line-number-composite-segmented-string.html
new file mode 100644
index 0000000..1be5c6a
--- /dev/null
+++ b/LayoutTests/fast/parser/line-number-composite-segmented-string.html
@@ -0,0 +1,7 @@
+<script>document.writeln("\n");
+</script><script></script>
+This test passes if it doesn't trigger an ASSERT.
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+</script>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b5a19bd..34a600f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-06  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION (r74663): ASSERTION FAILED: m_tokenizer->lineNumber() == line.zeroBasedInt()
+        https://bugs.webkit.org/show_bug.cgi?id=52013
+
+        When excluding line numbers for composite strings, we forgot to exclude
+        the line number for the current string!
+
+        Test: fast/parser/line-number-composite-segmented-string.html
+
+        * platform/text/SegmentedString.cpp:
+        (WebCore::SegmentedString::setExcludeLineNumbers):
+
 2011-01-06  Chris Marrin  <cmarrin at apple.com>
 
         Unreviewed.
diff --git a/WebCore/platform/text/SegmentedString.cpp b/WebCore/platform/text/SegmentedString.cpp
index 6a26581..a371582 100644
--- a/WebCore/platform/text/SegmentedString.cpp
+++ b/WebCore/platform/text/SegmentedString.cpp
@@ -78,13 +78,13 @@ unsigned SegmentedString::length() const
 
 void SegmentedString::setExcludeLineNumbers()
 {
+    m_currentString.setExcludeLineNumbers();
     if (m_composite) {
         Deque<SegmentedSubstring>::iterator it = m_substrings.begin();
         Deque<SegmentedSubstring>::iterator e = m_substrings.end();
         for (; it != e; ++it)
             it->setExcludeLineNumbers();
-    } else
-        m_currentString.setExcludeLineNumbers();
+    }
 }
 
 void SegmentedString::clear()

-- 
WebKit Debian packaging