<!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>[193267] 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/193267">193267</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:03:40 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191421">r191421</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 (193266 => 193267)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:03:35 UTC (rev 193266)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:03:40 UTC (rev 193267)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191421. rdar://problem/23221163
+
+ 2015-10-21 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.
+
+ The "srcset" attribute parsing is a simplification of:
+ https://html.spec.whatwg.org/multipage/embedded-content.html#attr-img-srcset
+
+ The "srcset" attribute value is expected to be in comma
+ separated groups. Within each group we always expect a link,
+ and an optional descriptor. We want to linkify the link.
+
+ * UserInterface/Views/CodeMirrorAdditions.js:
+ (tokenizeSrcSetString):
+ (extendedXMLToken):
+ When parsing srcset attribute, parse links as link tokens
+ so that they are linkified in resource content views.
+
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype._buildAttributeDOM):
+ When creating the DOMTree DOM for srcset attributes,
+ create link elements for the link values of attribute value.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191418. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-21 Devin Rousso <dcrousso+webkit@gmail.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCodeMirrorAdditionsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js (193266 => 193267)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2015-12-03 19:03:35 UTC (rev 193266)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2015-12-03 19:03:40 UTC (rev 193267)
</span><span class="lines">@@ -65,10 +65,50 @@
</span><span class="cx"> delete state._linkTokenize;
</span><span class="cx"> delete state._linkQuoteCharacter;
</span><span class="cx"> delete state._linkBaseStyle;
</span><ins>+ delete state._srcSetTokenizeState;
</ins><span class="cx">
</span><span class="cx"> return style;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function tokenizeSrcSetString(stream, state)
+ {
+ console.assert(state._linkQuoteCharacter !== undefined);
+
+ if (state._srcSetTokenizeState === "link") {
+ // Eat the string until a space, comma, or ending quote.
+ // If this is unquoted, then eat until whitespace or common parse errors.
+ if (state._linkQuoteCharacter)
+ stream.eatWhile(new RegExp("[^\\s," + state._linkQuoteCharacter + "]"));
+ else
+ stream.eatWhile(/[^\s,\u00a0=<>\"\']/);
+ } else {
+ // Eat the string until a comma, or ending quote.
+ // If this is unquoted, then eat until whitespace or common parse errors.
+ stream.eatSpace();
+ if (state._linkQuoteCharacter)
+ stream.eatWhile(new RegExp("[^," + state._linkQuoteCharacter + "]"));
+ else
+ stream.eatWhile(/[^\s\u00a0=<>\"\',]/);
+ stream.eatWhile(/[\s,]/);
+ }
+
+ // If the stream isn't at the end of line and we found the end quote
+ // change _linkTokenize to parse the end of the link next. Otherwise
+ // _linkTokenize will stay as-is to parse more of the srcset.
+ if (!stream.eol() && (!state._linkQuoteCharacter || stream.peek() === state._linkQuoteCharacter))
+ state._linkTokenize = tokenizeEndOfLinkString;
+
+ // Link portion.
+ if (state._srcSetTokenizeState === "link") {
+ state._srcSetTokenizeState = "descriptor";
+ return "link";
+ }
+
+ // Descriptor portion.
+ state._srcSetTokenizeState = "link";
+ return state._linkBaseStyle;
+ }
+
</ins><span class="cx"> function extendedXMLToken(stream, state)
</span><span class="cx"> {
</span><span class="cx"> if (state._linkTokenize) {
</span><span class="lines">@@ -86,8 +126,12 @@
</span><span class="cx"> var text = stream.current().toLowerCase();
</span><span class="cx"> if (text === "href" || text === "src")
</span><span class="cx"> state._expectLink = true;
</span><del>- else
</del><ins>+ else if (text === "srcset")
+ state._expectSrcSet = true;
+ else {
</ins><span class="cx"> delete state._expectLink;
</span><ins>+ delete state._expectSrcSet;
+ }
</ins><span class="cx"> } else if (state._expectLink && style === "string") {
</span><span class="cx"> var current = stream.current();
</span><span class="cx">
</span><span class="lines">@@ -100,6 +144,32 @@
</span><span class="cx"> state._linkTokenize = tokenizeLinkString;
</span><span class="cx"> state._linkBaseStyle = style;
</span><span class="cx">
</span><ins>+ // The attribute should be quoted.
+ var quote = current[0];
+
+ state._linkQuoteCharacter = quote === "'" || quote === "\"" ? quote : null;
+
+ // Rewind the stream to the start of this token.
+ stream.pos = startPosition;
+
+ // Eat the open quote of the string so the string style
+ // will be used for the quote character.
+ if (state._linkQuoteCharacter)
+ stream.eat(state._linkQuoteCharacter);
+ }
+ } else if (state._expectSrcSet && style === "string") {
+ var current = stream.current();
+
+ // Unless current token is empty quotes, consume quote character
+ // and tokenize link next.
+ if (current !== "\"\"" && current !== "''") {
+ delete state._expectSrcSet;
+
+ // This is a link, so setup the state to process it next.
+ state._srcSetTokenizeState = "link";
+ state._linkTokenize = tokenizeSrcSetString;
+ state._linkBaseStyle = style;
+
</ins><span class="cx"> // The attribute may or may not be quoted.
</span><span class="cx"> var quote = current[0];
</span><span class="cx">
</span><span class="lines">@@ -118,6 +188,7 @@
</span><span class="cx"> // spaces and the equal character are not tokenized. So if we get
</span><span class="cx"> // another token before a string then we stop expecting a link.
</span><span class="cx"> delete state._expectLink;
</span><ins>+ delete state._expectSrcSet;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return style && (style + " m-" + this.name);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (193266 => 193267)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 19:03:35 UTC (rev 193266)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 19:03:40 UTC (rev 193267)
</span><span class="lines">@@ -1111,6 +1111,37 @@
</span><span class="cx"> attrValueElement.textContent = value;
</span><span class="cx"> attrSpanElement.appendChild(attrValueElement);
</span><span class="cx"> }
</span><ins>+ } else if (name === "srcset") {
+ var baseURL = node.ownerDocument ? node.ownerDocument.documentURL : null;
+ attrValueElement = attrSpanElement.createChild("span", "html-attribute-value");
+
+ var groups = value.split(/\s*,\s*/);
+ for (var i = 0; i < groups.length; ++i) {
+ var string = groups[i];
+ var spaceIndex = string.search(/\s/);
+
+ if (spaceIndex === -1) {
+ var linkText = string;
+ var rewrittenURL = absoluteURL(string, baseURL);
+ var linkElement = attrValueElement.appendChild(document.createElement("a"));
+ linkElement.href = rewrittenURL;
+ linkElement.textContent = linkText.insertWordBreakCharacters();
+ } else {
+ var linkText = string.substring(0, spaceIndex);
+ var descriptorText = string.substring(spaceIndex).insertWordBreakCharacters();
+ var rewrittenURL = absoluteURL(linkText, baseURL);
+ var linkElement = attrValueElement.appendChild(document.createElement("a"));
+ linkElement.href = rewrittenURL;
+ linkElement.textContent = linkText.insertWordBreakCharacters();
+ var descriptorElement = attrValueElement.appendChild(document.createElement("span"));
+ descriptorElement.textContent = string.substring(spaceIndex);
+ }
+
+ if (i < groups.length - 1) {
+ var commaElement = attrValueElement.appendChild(document.createElement("span"));
+ commaElement.textContent = ", ";
+ }
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> value = value.insertWordBreakCharacters();
</span><span class="cx"> attrValueElement = attrSpanElement.createChild("span", "html-attribute-value");
</span></span></pre>
</div>
</div>
</body>
</html>