Changeset 106468 in webkit

Timestamp:

Feb 1, 2012 9:03:16 AM (12 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: debugger reports wrong sources when paused in inline script on page reload
​https://bugs.webkit.org/show_bug.cgi?id=77548

Source/WebCore:

V8 returns treats each script source as ending with \n, now we take
this into account when reporting script line count to the inspector
front-end.

Reviewed by Vsevolod Vlasov.

Test: inspector/debugger/pause-in-inline-script.html

• bindings/js/ScriptDebugServer.cpp:

(WebCore::ScriptDebugServer::dispatchDidParseSource):

• bindings/v8/DebuggerScript.js:

LayoutTests:

Reviewed by Vsevolod Vlasov.

• inspector/debugger/debugger-scripts-expected.txt:
• inspector/debugger/pause-in-inline-script-expected.txt: Added.
• inspector/debugger/pause-in-inline-script.html: Added.
• platform/chromium/inspector/debugger/debugger-scripts-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/debugger-scripts-expected.txt (modified) (2 diffs)
• LayoutTests/inspector/debugger/pause-in-inline-script-expected.txt (added)
• LayoutTests/inspector/debugger/pause-in-inline-script.html (added)
• LayoutTests/platform/chromium/inspector/debugger/debugger-scripts-expected.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/ScriptDebugServer.cpp (modified) (1 diff)
• Source/WebCore/bindings/v8/DebuggerScript.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-01  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: debugger reports wrong sources when paused in inline script on page reload
+        https://bugs.webkit.org/show_bug.cgi?id=77548
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/debugger/debugger-scripts-expected.txt:
+        * inspector/debugger/pause-in-inline-script-expected.txt: Added.
+        * inspector/debugger/pause-in-inline-script.html: Added.
+        * platform/chromium/inspector/debugger/debugger-scripts-expected.txt:
+
 2012-02-01  Shinya Kawanaka  <shinyak@google.com>
 

trunk/LayoutTests/inspector/debugger/debugger-scripts-expected.txt

@@ -4 +4 @@
 script 1:
     start: 5:8
-    end: 37:2
+    end: 38:0
 script 2:
     start: 38:21
-    end: 41:2
+    end: 42:0
 script 3:
     start: 43:11
@@ -13 +13 @@
 script 4:
     start: 44:11
-    end: 44:28
+    end: 45:0
 script 5:
     start: 46:11
-    end: 47:20
+    end: 48:0
 script 6:
     start: 51:56

trunk/LayoutTests/platform/chromium/inspector/debugger/debugger-scripts-expected.txt

@@ -4 +4 @@
 script 1:
     start: 5:8
-    end: 37:2
+    end: 38:0
 script 2:
     start: 38:21
-    end: 41:2
+    end: 42:0
 script 3:
     start: 43:11
@@ -13 +13 @@
 script 4:
     start: 44:11
-    end: 44:28
+    end: 45:0
 script 5:
     start: 46:11
-    end: 47:20
+    end: 48:0
 script 6:
     start: 51:56

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-01  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: debugger reports wrong sources when paused in inline script on page reload
+        https://bugs.webkit.org/show_bug.cgi?id=77548
+
+        V8 returns treats each script source as ending with \n, now we take
+        this into account when reporting script line count to the inspector
+        front-end.
+
+        Reviewed by Vsevolod Vlasov.
+
+        Test: inspector/debugger/pause-in-inline-script.html
+
+        * bindings/js/ScriptDebugServer.cpp:
+        (WebCore::ScriptDebugServer::dispatchDidParseSource):
+        * bindings/v8/DebuggerScript.js:
+
 2012-02-01  Shinya Kawanaka  <shinyak@google.com>
 

trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp

@@ -243 +243 @@
     int lineCount = 1;
     int lastLineStart = 0;
-    for (int i = 0; i < sourceLength - 1; ++i) {
+    for (int i = 0; i < sourceLength; ++i) {
         if (script.source[i] == '\n') {
             lineCount += 1;

trunk/Source/WebCore/bindings/v8/DebuggerScript.js

@@ -91 +91 @@
     var endLine = script.line_offset + lineCount - 1;
     var endColumn;
-    if (lineCount === 1)
-        endColumn = script.source.length + script.column_offset;
-    else
-        endColumn = script.source.length - (script.line_ends[lineCount - 2] + 1);
+    // V8 will not count last line if script source ends with \n.
+    if (script.source[script.source.length - 1] === '\n') {
+        endLine += 1;
+        endColumn = 0;
+    } else {
+        if (lineCount === 1)
+            endColumn = script.source.length + script.column_offset;
+        else
+            endColumn = script.source.length - (lineEnds[lineCount - 2] + 1);
+    }
 
     return {