Changeset 116940 in webkit

Timestamp:

May 14, 2012 6:25:43 AM (12 years ago)

Author:

pfeldman@chromium.org

Message:

[Qt] REGRESSION (r116789): inspector/debugger/script-formatter-console.html fails
​https://bugs.webkit.org/show_bug.cgi?id=86336

Reviewed by Yury Semikhatsky.

Source/WebCore:

• inspector/front-end/ConsoleMessage.js:

(WebInspector.ConsoleMessageImpl.prototype.location):

LayoutTests:

• inspector/debugger/script-formatter-breakpoints.html:
• platform/qt/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/script-formatter-breakpoints.html (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/ConsoleMessage.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-14  Pavel Feldman  <pfeldman@chromium.org>
+
+        [Qt] REGRESSION (r116789): inspector/debugger/script-formatter-console.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=86336
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/debugger/script-formatter-breakpoints.html:
+        * platform/qt/Skipped:
+
 2012-05-14  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/inspector/debugger/script-formatter-breakpoints.html

@@ -15 +15 @@
 var test = function()
 {
+    WebInspector.breakpointManager._storage._breakpoints = {};
     var panel = WebInspector.panels.scripts;
     var sourceFrame;

trunk/LayoutTests/platform/qt/Skipped

@@ -2562 +2562 @@
 fast/frames/seamless/seamless-inherited-document-style.html
 
-# [Qt] REGRESSION (r116789): inspector/debugger/script-formatter-console.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=86336
-inspector/debugger/script-formatter-console.html
-
-# [Qt] REGRESSION (r116775): inspector/debugger/script-formatter-breakpoints.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=86337
-inspector/debugger/script-formatter-breakpoints.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-14  Pavel Feldman  <pfeldman@chromium.org>
+
+        [Qt] REGRESSION (r116789): inspector/debugger/script-formatter-console.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=86336
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/ConsoleMessage.js:
+        (WebInspector.ConsoleMessageImpl.prototype.location):
+
 2012-05-14  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js

@@ -605 +605 @@
         // FIXME(62725): stack trace line/column numbers are one-based.
         var lineNumber = this.stackTrace ? this.stackTrace[0].lineNumber - 1 : this.line - 1;
-        var columnNumber = this.stackTrace ? this.stackTrace[0].columnNumber - 1 : 0;
+        var columnNumber = this.stackTrace && this.stackTrace[0].columnNumber ? this.stackTrace[0].columnNumber - 1 : 0;
         return WebInspector.debuggerModel.createRawLocationByURL(this.url, lineNumber, columnNumber);
     },