Title: [193247] branches/safari-601-branch
- Revision
- 193247
- Author
- [email protected]
- Date
- 2015-12-03 11:01:48 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r190551. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193246 => 193247)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 19:01:42 UTC (rev 193246)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 19:01:48 UTC (rev 193247)
@@ -1,5 +1,18 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r190551. rdar://problem/23221163
+
+ 2015-10-04 Nikita Vasilyev <[email protected]>
+
+ Web Inspector: Wrong column numbers in error object views
+ https://bugs.webkit.org/show_bug.cgi?id=149795
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/debugger/js-stacktrace-expected.txt:
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r190528. rdar://problem/23221163
2015-10-02 Devin Rousso <[email protected]>
Modified: branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt (193246 => 193247)
--- branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2015-12-03 19:01:42 UTC (rev 193246)
+++ branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2015-12-03 19:01:48 UTC (rev 193247)
@@ -21,14 +21,14 @@
{
"functionName": "typeError",
"url": "/inspector/debugger/js-stacktrace.html",
- "lineNumber": "14",
- "columnNumber": "30"
+ "lineNumber": 14,
+ "columnNumber": 30
},
{
"functionName": "typeErrorWrap",
"url": "/inspector/debugger/js-stacktrace.html",
- "lineNumber": "7",
- "columnNumber": "21"
+ "lineNumber": 7,
+ "columnNumber": 21
}
]
@@ -59,8 +59,8 @@
{
"functionName": "typeError",
"url": "/inspector/debugger/js-stacktrace.html",
- "lineNumber": "14",
- "columnNumber": "30"
+ "lineNumber": 14,
+ "columnNumber": 30
},
{
"functionName": "map",
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193246 => 193247)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:01:42 UTC (rev 193246)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:01:48 UTC (rev 193247)
@@ -1,5 +1,22 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r190551. rdar://problem/23221163
+
+ 2015-10-04 Nikita Vasilyev <[email protected]>
+
+ Web Inspector: Wrong column numbers in error object views
+ https://bugs.webkit.org/show_bug.cgi?id=149795
+
+ Convert columnNumber and lineNumber properties from strings to numbers
+ to prevent accidental string concatenations.
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/StackTrace.js:
+ (WebInspector.StackTrace._parseStackTrace):
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r190542. rdar://problem/23221163
2015-10-02 Matt Baker <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/StackTrace.js (193246 => 193247)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/StackTrace.js 2015-12-03 19:01:42 UTC (rev 193246)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/StackTrace.js 2015-12-03 19:01:48 UTC (rev 193247)
@@ -66,12 +66,12 @@
var columnIndex = url.lastIndexOf(":");
if (columnIndex !== -1) {
- columnNumber = url.slice(columnIndex + 1);
+ columnNumber = parseInt(url.slice(columnIndex + 1));
url = "" columnIndex);
var lineIndex = url.lastIndexOf(":", columnIndex);
if (lineIndex !== -1) {
- lineNumber = url.slice(lineIndex + 1, columnIndex);
+ lineNumber = parseInt(url.slice(lineIndex + 1, columnIndex));
url = "" lineIndex);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
