<!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>[193270] branches/safari-601-branch/Source/WebInspectorUI</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/193270">193270</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:03:55 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191478">r191478</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCodeMirrorAdditionsjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193269 => 193270)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:03:50 UTC (rev 193269)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:03:55 UTC (rev 193270)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191478. rdar://problem/23221163
+
+ 2015-10-22 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: srcset attributes should have hyperlinks to the resources
+ https://bugs.webkit.org/show_bug.cgi?id=150409
+
+ Reviewed by Timothy Hatcher.
+
+ Follow-up tweaks and fixes that were intended to be landed.
+
+ * UserInterface/Views/CodeMirrorAdditions.js:
+ (tokenizeSrcSetString):
+ Multiline parsing has issues recovering the state CodeMirror
+ expects, so we just bail in those cases. Leading whitespace
+ is also handled poorly, but expected to be rare.
+
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype._buildAttributeDOM):
+ Trim to eliminate leading whitespace.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191464. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-22 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCodeMirrorAdditionsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js (193269 => 193270)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2015-12-03 19:03:50 UTC (rev 193269)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2015-12-03 19:03:55 UTC (rev 193270)
</span><span class="lines">@@ -88,14 +88,14 @@
</span><span class="cx"> if (state._linkQuoteCharacter)
</span><span class="cx"> stream.eatWhile(new RegExp("[^," + state._linkQuoteCharacter + "]"));
</span><span class="cx"> else
</span><del>- stream.eatWhile(/[^\s\u00a0=<>\"\',]/);
</del><ins>+ stream.eatWhile(/[^\s\u00a0=<>\"\']/);
</ins><span class="cx"> stream.eatWhile(/[\s,]/);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the stream isn't at the end of line and we found the end quote
</span><span class="cx"> // change _linkTokenize to parse the end of the link next. Otherwise
</span><span class="cx"> // _linkTokenize will stay as-is to parse more of the srcset.
</span><del>- if (!stream.eol() && (!state._linkQuoteCharacter || stream.peek() === state._linkQuoteCharacter))
</del><ins>+ if (stream.eol() || (!state._linkQuoteCharacter || stream.peek() === state._linkQuoteCharacter))
</ins><span class="cx"> state._linkTokenize = tokenizeEndOfLinkString;
</span><span class="cx">
</span><span class="cx"> // Link portion.
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> state._linkTokenize = tokenizeLinkString;
</span><span class="cx"> state._linkBaseStyle = style;
</span><span class="cx">
</span><del>- // The attribute should be quoted.
</del><ins>+ // The attribute may or may not be quoted.
</ins><span class="cx"> var quote = current[0];
</span><span class="cx">
</span><span class="cx"> state._linkQuoteCharacter = quote === "'" || quote === "\"" ? quote : null;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (193269 => 193270)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 19:03:50 UTC (rev 193269)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 19:03:55 UTC (rev 193270)
</span><span class="lines">@@ -1115,9 +1115,10 @@
</span><span class="cx"> var baseURL = node.ownerDocument ? node.ownerDocument.documentURL : null;
</span><span class="cx"> attrValueElement = attrSpanElement.createChild("span", "html-attribute-value");
</span><span class="cx">
</span><ins>+ // Leading whitespace.
</ins><span class="cx"> var groups = value.split(/\s*,\s*/);
</span><span class="cx"> for (var i = 0; i < groups.length; ++i) {
</span><del>- var string = groups[i];
</del><ins>+ var string = groups[i].trim();
</ins><span class="cx"> var spaceIndex = string.search(/\s/);
</span><span class="cx">
</span><span class="cx"> if (spaceIndex === -1) {
</span></span></pre>
</div>
</div>
</body>
</html>