<!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>[193452] branches/safari-601.1.46-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/193452">193452</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 12:53:33 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187897">r187897</a>. rdar://problem/23581597</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestsinspectormodelremoteobjectexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsinspectormodelremoteobjecthtml">branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object.html</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreinspectorInjectedScriptSourcejs">branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193451 => 193452)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-04 20:53:26 UTC (rev 193451)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-04 20:53:33 UTC (rev 193452)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-12-04 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187897. rdar://problem/23581597
+
+ 2015-08-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Object previews for SVG elements shows SVGAnimatedString instead of text
+ https://bugs.webkit.org/show_bug.cgi?id=147328
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/model/remote-object-expected.txt:
+ * inspector/model/remote-object.html:
+
+2015-12-04 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r192592. rdar://problem/23581597
</span><span class="cx">
</span><span class="cx"> 2015-11-18 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object-expected.txt (193451 => 193452)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object-expected.txt 2015-12-04 20:53:26 UTC (rev 193451)
+++ branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object-expected.txt 2015-12-04 20:53:33 UTC (rev 193452)
</span><span class="lines">@@ -1826,20 +1826,64 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -----------------------------------------------------
</span><del>-EXPRESSION: [document.body, div, span, input, text, comment]
</del><ins>+EXPRESSION: svgElement = document.createElementNS('http://www.w3.org/2000/svg', 'rect'); svgElement.classList.add('test'); svgElement
</ins><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "node",
+ "_objectId": "<filtered>",
+ "_description": "rect.test",
+ "_preview": {
+ "_type": "object",
+ "_subtype": "node",
+ "_description": "rect.test",
+ "_lossless": false,
+ "_overflow": true,
+ "_properties": [
+ {
+ "_name": "x",
+ "_type": "object",
+ "_value": "SVGAnimatedLength"
+ },
+ {
+ "_name": "y",
+ "_type": "object",
+ "_value": "SVGAnimatedLength"
+ },
+ {
+ "_name": "width",
+ "_type": "object",
+ "_value": "SVGAnimatedLength"
+ },
+ {
+ "_name": "height",
+ "_type": "object",
+ "_value": "SVGAnimatedLength"
+ },
+ {
+ "_name": "rx",
+ "_type": "object",
+ "_value": "SVGAnimatedLength"
+ }
+ ],
+ "_entries": null
+ }
+}
+
+-----------------------------------------------------
+EXPRESSION: [document.body, div, span, input, text, comment, svgElement]
+{
+ "_type": "object",
</ins><span class="cx"> "_subtype": "array",
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Array",
</span><del>- "_size": 6,
</del><ins>+ "_size": 7,
</ins><span class="cx"> "_preview": {
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_subtype": "array",
</span><span class="cx"> "_description": "Array",
</span><span class="cx"> "_lossless": false,
</span><span class="cx"> "_overflow": false,
</span><del>- "_size": 6,
</del><ins>+ "_size": 7,
</ins><span class="cx"> "_properties": [
</span><span class="cx"> {
</span><span class="cx"> "_name": "0",
</span><span class="lines">@@ -1876,6 +1920,12 @@
</span><span class="cx"> "_type": "object",
</span><span class="cx"> "_subtype": "node",
</span><span class="cx"> "_value": "<!--comment content-->"
</span><ins>+ },
+ {
+ "_name": "6",
+ "_type": "object",
+ "_subtype": "node",
+ "_value": "<rect class=\"test\">"
</ins><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "_entries": null
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsinspectormodelremoteobjecthtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object.html (193451 => 193452)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object.html 2015-12-04 20:53:26 UTC (rev 193451)
+++ branches/safari-601.1.46-branch/LayoutTests/inspector/model/remote-object.html 2015-12-04 20:53:33 UTC (rev 193452)
</span><span class="lines">@@ -113,7 +113,8 @@
</span><span class="cx"> {expression: "input = document.createElement('input'); input.type = 'password'; input"},
</span><span class="cx"> {expression: "text = document.createTextNode('text content'); text"},
</span><span class="cx"> {expression: "comment = document.createComment('comment content'); comment"},
</span><del>- {expression: "[document.body, div, span, input, text, comment]"},
</del><ins>+ {expression: "svgElement = document.createElementNS('http://www.w3.org/2000/svg', 'rect'); svgElement.classList.add('test'); svgElement"},
+ {expression: "[document.body, div, span, input, text, comment, svgElement]"},
</ins><span class="cx">
</span><span class="cx"> // Node Collections (NodeLists / Collections)
</span><span class="cx"> {expression: "document.all", browserOnly: true}, // HTMLAllCollection
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog (193451 => 193452)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-12-04 20:53:26 UTC (rev 193451)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-12-04 20:53:33 UTC (rev 193452)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-04 Timothy Hatcher <timothy@apple.com>
+
+ Merge r187897. rdar://problem/23581597
+
+ 2015-08-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Object previews for SVG elements shows SVGAnimatedString instead of text
+ https://bugs.webkit.org/show_bug.cgi?id=147328
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InjectedScriptSource.js:
+ Use classList and classList.toString instead of className.
+
</ins><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191967. rdar://problem/23221163
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/InjectedScriptSource.js (193451 => 193452)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-12-04 20:53:26 UTC (rev 193451)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-12-04 20:53:33 UTC (rev 193452)
</span><span class="lines">@@ -810,8 +810,8 @@
</span><span class="cx"> case 1: // Node.ELEMENT_NODE
</span><span class="cx"> if (node.id)
</span><span class="cx"> return "<" + nodeName + " id=\"" + node.id + "\">";
</span><del>- if (node.className)
- return "<" + nodeName + " class=\"" + node.className + "\">";
</del><ins>+ if (node.classList.length)
+ return "<" + nodeName + " class=\"" + node.classList.toString() + "\">";
</ins><span class="cx"> if (nodeName === "input" && node.type)
</span><span class="cx"> return "<" + nodeName + " type=\"" + node.type + "\">";
</span><span class="cx"> return "<" + nodeName + ">";
</span></span></pre>
</div>
</div>
</body>
</html>