[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[yurys at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit bec060cb5b3de6bcb0a384413ffad93e4079d594
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 09:17:36 2011 +0000

    2011-01-19  Peter Rybin  <peter.rybin at gmail.com>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: script column offset is incorrect
            https://bugs.webkit.org/show_bug.cgi?id=52580
    
            Column is updated in 3 places, 2 less probable places contained error.
            Fixed now.
    
            * platform/text/SegmentedString.cpp:
            (WebCore::SegmentedString::advanceSlowCase):
            * platform/text/SegmentedString.h:
            (WebCore::SegmentedString::advancePastNewline):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 762fdc3..c1cab40 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-19  Peter Rybin  <peter.rybin at gmail.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: script column offset is incorrect
+        https://bugs.webkit.org/show_bug.cgi?id=52580
+
+        Column is updated in 3 places, 2 less probable places contained error.
+        Fixed now.
+
+        * platform/text/SegmentedString.cpp:
+        (WebCore::SegmentedString::advanceSlowCase):
+        * platform/text/SegmentedString.h:
+        (WebCore::SegmentedString::advancePastNewline):
+
 2011-01-18  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/Source/WebCore/platform/text/SegmentedString.cpp b/Source/WebCore/platform/text/SegmentedString.cpp
index a371582..5e9755b 100644
--- a/Source/WebCore/platform/text/SegmentedString.cpp
+++ b/Source/WebCore/platform/text/SegmentedString.cpp
@@ -246,7 +246,8 @@ void SegmentedString::advanceSlowCase(int& lineNumber)
         if (*m_currentString.m_current++ == '\n' && m_currentString.doNotExcludeLineNumbers()) {
             ++lineNumber;
             ++m_currentLine;
-            m_numberOfCharactersConsumedPriorToCurrentLine = numberOfCharactersConsumed();
+            // Plus 1 because numberOfCharactersConsumed value hasn't incremented yet; it does with m_length decrement below.
+            m_numberOfCharactersConsumedPriorToCurrentLine = numberOfCharactersConsumed() + 1;
         }
         if (--m_currentString.m_length == 0)
             advanceSubstring();
diff --git a/Source/WebCore/platform/text/SegmentedString.h b/Source/WebCore/platform/text/SegmentedString.h
index 5f548c7..30c899d 100644
--- a/Source/WebCore/platform/text/SegmentedString.h
+++ b/Source/WebCore/platform/text/SegmentedString.h
@@ -164,7 +164,7 @@ public:
             lineNumber += newLineFlag;
             m_currentLine += newLineFlag;
             if (newLineFlag)
-                m_numberOfCharactersConsumedPriorToCurrentLine = numberOfCharactersConsumed();
+                m_numberOfCharactersConsumedPriorToCurrentLine = numberOfCharactersConsumed() + 1;
             --m_currentString.m_length;
             m_currentChar = ++m_currentString.m_current;
             return;

-- 
WebKit Debian packaging