<!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>[193160] 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/193160">193160</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:52:25 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188739">r188739</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseURLUtilitiesjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/URLUtilities.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsResourcejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/Resource.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsSourceCodeLocationjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsResourceTreeElementjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.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 (193159 => 193160)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:52:20 UTC (rev 193159)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:52:25 UTC (rev 193160)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188739. rdar://problem/23221163
+
+ 2015-08-20 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Truncate data URIs
+ https://bugs.webkit.org/show_bug.cgi?id=148212
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/URLUtilities.js:
+ (parseURL):
+ Exit early to avoid an expensive RegExp match on a potentially very large data URI.
+
+ (parseQueryString):
+ Fix typo.
+
+ (WebInspector.displayNameForURL):
+ (WebInspector.truncateURL):
+ By default, only show first and last 3 characters of data URIs.
+
+ * UserInterface/Models/Resource.js:
+ (WebInspector.Resource.prototype.get displayURL):
+ For tooltips, show first and last 32 characters of data URIs.
+
+ * UserInterface/Models/SourceCodeLocation.js:
+ (WebInspector.SourceCodeLocation.prototype._locationString):
+ * UserInterface/Views/ResourceTreeElement.js:
+ (WebInspector.ResourceTreeElement.prototype._updateToolTip):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188733. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-20 Devin Rousso <drousso@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseURLUtilitiesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/URLUtilities.js (193159 => 193160)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/URLUtilities.js 2015-12-03 18:52:20 UTC (rev 193159)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/URLUtilities.js 2015-12-03 18:52:25 UTC (rev 193160)
</span><span class="lines">@@ -74,6 +74,9 @@
</span><span class="cx"> {
</span><span class="cx"> url = url ? url.trim() : "";
</span><span class="cx">
</span><ins>+ if (url.startsWith("data:"))
+ return {scheme: "data", host: null, port: null, path: null, queryString: null, fragment: null, lastPathComponent: null};
+
</ins><span class="cx"> var match = url.match(/^([^:]+):\/\/([^\/:]*)(?::([\d]+))?(?:(\/[^#]*)(?:#(.*))?)?$/i);
</span><span class="cx"> if (!match)
</span><span class="cx"> return {scheme: null, host: null, port: null, path: null, queryString: null, fragment: null, lastPathComponent: null};
</span><span class="lines">@@ -169,7 +172,7 @@
</span><span class="cx"> function decode(string)
</span><span class="cx"> {
</span><span class="cx"> try {
</span><del>- // Replace "+" with " " then decode precent encoded values.
</del><ins>+ // Replace "+" with " " then decode percent encoded values.
</ins><span class="cx"> return decodeURIComponent(string.replace(/\+/g, " "));
</span><span class="cx"> } catch (e) {
</span><span class="cx"> return string;
</span><span class="lines">@@ -191,6 +194,9 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.displayNameForURL = function(url, urlComponents)
</span><span class="cx"> {
</span><ins>+ if (url.startsWith("data:"))
+ return WebInspector.truncateURL(url);
+
</ins><span class="cx"> if (!urlComponents)
</span><span class="cx"> urlComponents = parseURL(url);
</span><span class="cx">
</span><span class="lines">@@ -204,6 +210,27 @@
</span><span class="cx"> return displayName || WebInspector.displayNameForHost(urlComponents.host) || url;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.truncateURL = function(url, multiline = false, dataURIMaxSize = 6)
+{
+ if (!url.startsWith("data:"))
+ return url;
+
+ var dataIndex = url.indexOf(",") + 1;
+ var header = url.slice(0, dataIndex);
+ if (multiline)
+ header += "\n";
+
+ var data = url.slice(dataIndex);
+ if (data.length < dataURIMaxSize)
+ return header + data;
+
+ var firstChunk = data.slice(0, Math.ceil(dataURIMaxSize / 2));
+ var ellipsis = "\u2026";
+ var middleChunk = multiline ? `\n${ellipsis}\n` : ellipsis;
+ var lastChunk = data.slice(-Math.floor(dataURIMaxSize / 2));
+ return header + firstChunk + middleChunk + lastChunk;
+};
+
</ins><span class="cx"> WebInspector.displayNameForHost = function(host)
</span><span class="cx"> {
</span><span class="cx"> // FIXME <rdar://problem/11237413>: This should decode punycode hostnames.
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsResourcejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/Resource.js (193159 => 193160)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/Resource.js 2015-12-03 18:52:20 UTC (rev 193159)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/Resource.js 2015-12-03 18:52:25 UTC (rev 193160)
</span><span class="lines">@@ -135,6 +135,13 @@
</span><span class="cx"> return WebInspector.displayNameForURL(this._url, this.urlComponents);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get displayURL()
+ {
+ var isMultiLine = true;
+ var dataURIMaxSize = 64;
+ return WebInspector.truncateURL(this._url, isMultiLine, dataURIMaxSize);
+ }
+
</ins><span class="cx"> get initiatorSourceCodeLocation()
</span><span class="cx"> {
</span><span class="cx"> return this._initiatorSourceCodeLocation;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsSourceCodeLocationjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js (193159 => 193160)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js 2015-12-03 18:52:20 UTC (rev 193159)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js 2015-12-03 18:52:25 UTC (rev 193160)
</span><span class="lines">@@ -333,8 +333,9 @@
</span><span class="cx">
</span><span class="cx"> case WebInspector.SourceCodeLocation.NameStyle.Short:
</span><span class="cx"> case WebInspector.SourceCodeLocation.NameStyle.Full:
</span><del>- var lineSuffix = sourceCode.url ? ":" + lineString : WebInspector.UIString(" (line %s)").format(lineString);
- return prefix + (nameStyle === WebInspector.SourceCodeLocation.NameStyle.Full && sourceCode.url ? sourceCode.url : sourceCode.displayName) + lineSuffix;
</del><ins>+ var displayURL = sourceCode.displayURL;
+ var lineSuffix = displayURL ? ":" + lineString : WebInspector.UIString(" (line %s)").format(lineString);
+ return prefix + (nameStyle === WebInspector.SourceCodeLocation.NameStyle.Full && displayURL ? displayURL : sourceCode.displayName) + lineSuffix;
</ins><span class="cx">
</span><span class="cx"> default:
</span><span class="cx"> console.error("Unknown nameStyle: " + nameStyle);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsResourceTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js (193159 => 193160)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2015-12-03 18:52:20 UTC (rev 193159)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2015-12-03 18:52:25 UTC (rev 193160)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> _updateToolTip()
</span><span class="cx"> {
</span><del>- this.tooltip = this._resource.url;
</del><ins>+ this.tooltip = this._resource.displayURL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _urlDidChange(event)
</span></span></pre>
</div>
</div>
</body>
</html>