Changeset 76106 in webkit

Timestamp:

Jan 19, 2011 1:17:36 AM (13 years ago)

Author:

yurys@chromium.org

Message:

2011-01-19 Peter Rybin <​peter.rybin@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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/SegmentedString.cpp (modified) (1 diff)
• platform/text/SegmentedString.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-19  Peter Rybin  <peter.rybin@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@chromium.org>
 

trunk/Source/WebCore/platform/text/SegmentedString.cpp

@@ -247 +247 @@
             ++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)

trunk/Source/WebCore/platform/text/SegmentedString.h

@@ -165 +165 @@
             m_currentLine += newLineFlag;
             if (newLineFlag)
-                m_numberOfCharactersConsumedPriorToCurrentLine = numberOfCharactersConsumed();
+                m_numberOfCharactersConsumedPriorToCurrentLine = numberOfCharactersConsumed() + 1;
             --m_currentString.m_length;
             m_currentChar = ++m_currentString.m_current;