<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193247] branches/safari-601-branch</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193247">193247</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:01:48 -0800 (Thu, 03 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190551">r190551</a>. rdar://problem/23221163</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectordebuggerjsstacktraceexpectedtxt">branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsStackTracejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/StackTrace.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193246 => 193247)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-12-02  Timothy Hatcher  &lt;timothy@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r190551. rdar://problem/23221163
+
+    2015-10-04  Nikita Vasilyev  &lt;nvasilyev@apple.com&gt;
+
+            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  &lt;timothy@apple.com&gt;
+
</ins><span class="cx">         Merge r190528. rdar://problem/23221163
</span><span class="cx"> 
</span><span class="cx">     2015-10-02  Devin Rousso  &lt;dcrousso+webkit@gmail.com&gt;
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordebuggerjsstacktraceexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/inspector/debugger/js-stacktrace-expected.txt (193246 => 193247)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -21,14 +21,14 @@
</span><span class="cx">     {
</span><span class="cx">         &quot;functionName&quot;: &quot;typeError&quot;,
</span><span class="cx">         &quot;url&quot;: &quot;/inspector/debugger/js-stacktrace.html&quot;,
</span><del>-        &quot;lineNumber&quot;: &quot;14&quot;,
-        &quot;columnNumber&quot;: &quot;30&quot;
</del><ins>+        &quot;lineNumber&quot;: 14,
+        &quot;columnNumber&quot;: 30
</ins><span class="cx">     },
</span><span class="cx">     {
</span><span class="cx">         &quot;functionName&quot;: &quot;typeErrorWrap&quot;,
</span><span class="cx">         &quot;url&quot;: &quot;/inspector/debugger/js-stacktrace.html&quot;,
</span><del>-        &quot;lineNumber&quot;: &quot;7&quot;,
-        &quot;columnNumber&quot;: &quot;21&quot;
</del><ins>+        &quot;lineNumber&quot;: 7,
+        &quot;columnNumber&quot;: 21
</ins><span class="cx">     }
</span><span class="cx"> ]
</span><span class="cx"> 
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx">     {
</span><span class="cx">         &quot;functionName&quot;: &quot;typeError&quot;,
</span><span class="cx">         &quot;url&quot;: &quot;/inspector/debugger/js-stacktrace.html&quot;,
</span><del>-        &quot;lineNumber&quot;: &quot;14&quot;,
-        &quot;columnNumber&quot;: &quot;30&quot;
</del><ins>+        &quot;lineNumber&quot;: 14,
+        &quot;columnNumber&quot;: 30
</ins><span class="cx">     },
</span><span class="cx">     {
</span><span class="cx">         &quot;functionName&quot;: &quot;map&quot;,
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193246 => 193247)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-12-02  Timothy Hatcher  &lt;timothy@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r190551. rdar://problem/23221163
+
+    2015-10-04  Nikita Vasilyev  &lt;nvasilyev@apple.com&gt;
+
+            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  &lt;timothy@apple.com&gt;
+
</ins><span class="cx">         Merge r190542. rdar://problem/23221163
</span><span class="cx"> 
</span><span class="cx">     2015-10-02  Matt Baker  &lt;mattbaker@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsStackTracejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/StackTrace.js (193246 => 193247)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -66,12 +66,12 @@
</span><span class="cx"> 
</span><span class="cx">                 var columnIndex = url.lastIndexOf(&quot;:&quot;);
</span><span class="cx">                 if (columnIndex !== -1) {
</span><del>-                    columnNumber = url.slice(columnIndex + 1);
</del><ins>+                    columnNumber = parseInt(url.slice(columnIndex + 1));
</ins><span class="cx"> 
</span><span class="cx">                     url = url.slice(0, columnIndex);
</span><span class="cx">                     var lineIndex = url.lastIndexOf(&quot;:&quot;, columnIndex);
</span><span class="cx">                     if (lineIndex !== -1) {
</span><del>-                        lineNumber = url.slice(lineIndex + 1, columnIndex);
</del><ins>+                        lineNumber = parseInt(url.slice(lineIndex + 1, columnIndex));
</ins><span class="cx">                         url = url.slice(0, lineIndex);
</span><span class="cx">                     }
</span><span class="cx">                 }
</span></span></pre>
</div>
</div>

</body>
</html>