Merge 106468 - Web Inspector: debugger reports wrong sources when paused in inline script on page...

Source/WebCore/bindings/v8/DebuggerScript.js

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 72 matching lines @@
     }
     return result;
 }
 
 DebuggerScript._formatScript = function(script)
 {
     var lineEnds = script.line_ends;
     var lineCount = lineEnds.length;
     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 {
         id: script.id,
         name: script.nameOrSourceURL(),
         source: script.source,
         startLine: script.line_offset,
         startColumn: script.column_offset,
         endLine: endLine,
         endColumn: endColumn,
         isContentScript: !!script.context_data && script.context_data.indexOf("injected") == 0
@@ skipping 163 matching lines @@
         "thisObject": thisObject,
         "scopeChain": scopeChain,
         "scopeType": scopeType,
         "evaluate": evaluate,
         "caller": callerFrame
     };
 }
 
 return DebuggerScript;
 })();