Title: [116940] trunk
Revision
116940
Author
[email protected]
Date
2012-05-14 06:25:43 -0700 (Mon, 14 May 2012)

Log 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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (116939 => 116940)


--- trunk/LayoutTests/ChangeLog	2012-05-14 13:10:44 UTC (rev 116939)
+++ trunk/LayoutTests/ChangeLog	2012-05-14 13:25:43 UTC (rev 116940)
@@ -1,3 +1,13 @@
+2012-05-14  Pavel Feldman  <[email protected]>
+
+        [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  <[email protected]>
 
         Unreviewed, rolling out r116932.

Modified: trunk/LayoutTests/inspector/debugger/script-formatter-breakpoints.html (116939 => 116940)


--- trunk/LayoutTests/inspector/debugger/script-formatter-breakpoints.html	2012-05-14 13:10:44 UTC (rev 116939)
+++ trunk/LayoutTests/inspector/debugger/script-formatter-breakpoints.html	2012-05-14 13:25:43 UTC (rev 116940)
@@ -14,6 +14,7 @@
 
 var test = function()
 {
+    WebInspector.breakpointManager._storage._breakpoints = {};
     var panel = WebInspector.panels.scripts;
     var sourceFrame;
 

Modified: trunk/LayoutTests/platform/qt/Skipped (116939 => 116940)


--- trunk/LayoutTests/platform/qt/Skipped	2012-05-14 13:10:44 UTC (rev 116939)
+++ trunk/LayoutTests/platform/qt/Skipped	2012-05-14 13:25:43 UTC (rev 116940)
@@ -2561,10 +2561,3 @@
 # https://bugs.webkit.org/show_bug.cgi?id=86182
 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

Modified: trunk/Source/WebCore/ChangeLog (116939 => 116940)


--- trunk/Source/WebCore/ChangeLog	2012-05-14 13:10:44 UTC (rev 116939)
+++ trunk/Source/WebCore/ChangeLog	2012-05-14 13:25:43 UTC (rev 116940)
@@ -1,3 +1,13 @@
+2012-05-14  Pavel Feldman  <[email protected]>
+
+        [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  <[email protected]>
 
         TiledBackingStore: Prevent partial tile updates when they intersect the keep rect.

Modified: trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js (116939 => 116940)


--- trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js	2012-05-14 13:10:44 UTC (rev 116939)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js	2012-05-14 13:25:43 UTC (rev 116940)
@@ -604,7 +604,7 @@
     {
         // 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);
     },
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to