<!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>[205314] trunk</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/205314">205314</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2016-09-01 14:04:49 -0700 (Thu, 01 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Minification detection produces false positives for small resources
https://bugs.webkit.org/show_bug.cgi?id=161159
<rdar://problem/27995306>
Reviewed by Brian Burg.
Source/WebInspectorUI:
Improve minification detection algorithm. Minified resources rarely have tabs and usually
have a very few line breaks. Counting tabs as 4 spaces and line breaks as 8 makes minification
detection heuristic more accurate. Increase ratio thresholds to accommodate for the changes in
whitespaceScore.
* UserInterface/Base/Utilities.js:
(isTextLikelyMinified):
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype._prepareEditorForInitialContent):
(WebInspector.SourceCodeTextEditor.prototype._isLikelyMinified): Deleted.
LayoutTests:
* inspector/formatting/is-text-likely-minified-expected.txt: Added.
* inspector/formatting/is-text-likely-minified.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorformattingistextlikelyminifiedexpectedtxt">trunk/LayoutTests/inspector/formatting/is-text-likely-minified-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorformattingistextlikelyminifiedhtml">trunk/LayoutTests/inspector/formatting/is-text-likely-minified.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205313 => 205314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-01 20:40:23 UTC (rev 205313)
+++ trunk/LayoutTests/ChangeLog 2016-09-01 21:04:49 UTC (rev 205314)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-01 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Minification detection produces false positives for small resources
+ https://bugs.webkit.org/show_bug.cgi?id=161159
+ <rdar://problem/27995306>
+
+ Reviewed by Brian Burg.
+
+ * inspector/formatting/is-text-likely-minified-expected.txt: Added.
+ * inspector/formatting/is-text-likely-minified.html: Added.
+
</ins><span class="cx"> 2016-09-01 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r205297.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingistextlikelyminifiedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/formatting/is-text-likely-minified-expected.txt (0 => 205314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/is-text-likely-minified-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/formatting/is-text-likely-minified-expected.txt 2016-09-01 21:04:49 UTC (rev 205314)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Test minification detection.
+
+
+== Running test suite: Formatting.isLikelyMinified
+-- Running test case: JavaScriptShortSnippet.Unminified
+PASS: This small JavaScript snippet should be classified as unminified.
+
+-- Running test case: JQuerySnippet.Unminified
+PASS: jQuery snippet should be classified as unminified.
+
+-- Running test case: JQuerySnippet.Minified
+PASS: jQuery snippet should be classified as minified.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorformattingistextlikelyminifiedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/formatting/is-text-likely-minified.html (0 => 205314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/formatting/is-text-likely-minified.html (rev 0)
+++ trunk/LayoutTests/inspector/formatting/is-text-likely-minified.html 2016-09-01 21:04:49 UTC (rev 205314)
</span><span class="lines">@@ -0,0 +1,118 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("Formatting.isLikelyMinified");
+
+ suite.addTestCase({
+ name: "JavaScriptShortSnippet.Unminified",
+ test: (resolve, reject) => {
+ InspectorTest.expectThat(!isTextLikelyMinified("var x = 42;\nvar y = 24;\n"), "This small JavaScript snippet should be classified as unminified.");
+ resolve();
+ }
+ });
+
+ let jquerySourceFragment = `/*eslint-disable no-unused-vars*/
+/*!
+ * jQuery JavaScript Library v3.1.0
+ * https://jquery.com/
+ *
+ * Includes Sizzle.js
+ * https://sizzlejs.com/
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2016-07-07T21:44Z
+ */
+( function( global, factory ) {
+
+ "use strict";
+
+ if ( typeof module === "object" && typeof module.exports === "object" ) {
+
+ // For CommonJS and CommonJS-like environments where a proper window
+ // is present, execute the factory and get jQuery.
+ // For environments that do not have a window with a document
+ // (such as Node.js), expose a factory as module.exports.
+ // This accentuates the need for the creation of a real window.
+ // e.g. var jQuery = require("jquery")(window);
+ // See ticket #14549 for more info.
+ module.exports = global.document ?
+ factory( global, true ) :
+ function( w ) {
+ if ( !w.document ) {
+ throw new Error( "jQuery requires a window with a document" );
+ }
+ return factory( w );
+ };
+ } else {
+ factory( global );
+ }
+
+// Pass this if window is not defined yet
+} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
+// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
+// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
+// enough that all such attempts are guarded in a try block.
+"use strict";
+
+var arr = [];
+
+var document = window.document;
+
+var getProto = Object.getPrototypeOf;
+
+var slice = arr.slice;
+
+var concat = arr.concat;
+
+var push = arr.push;
+
+var indexOf = arr.indexOf;
+
+var class2type = {};
+
+var toString = class2type.toString;
+
+var hasOwn = class2type.hasOwnProperty;
+
+var fnToString = hasOwn.toString;
+
+var ObjectFunctionString = fnToString.call( Object );
+
+var support = {};`;
+
+ suite.addTestCase({
+ name: "JQuerySnippet.Unminified",
+ test: (resolve, reject) => {
+ InspectorTest.expectThat(!isTextLikelyMinified(jquerySourceFragment), "jQuery snippet should be classified as unminified.");
+ resolve();
+ }
+ });
+
+ let jQueryMinifiedSourceFragment = `/*! jQuery v3.1.0 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.1.0",r=function(a,b){return new r.fn.init(a,b)},s=/^[s ]+|[s ]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null!=a?a<0?this[a+this.length]:this[a]:f.call(this)},pushStack:function(a
){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=r.isArray(d)))?(e?(e=!1,f=c&&r.isArray(c)?c:[]):f=c&&r.isPlain
Object(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){ret
urn a.replace(t,"ms-").replace(u,v)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},gu
id:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return `;
+
+ suite.addTestCase({
+ name: "JQuerySnippet.Minified",
+ test: (resolve, reject) => {
+ InspectorTest.expectThat(isTextLikelyMinified(jQueryMinifiedSourceFragment), "jQuery snippet should be classified as minified.");
+ resolve();
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+ </script>
+</head>
+<body onload="runTest();">
+<p>Test minification detection.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (205313 => 205314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-09-01 20:40:23 UTC (rev 205313)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-09-01 21:04:49 UTC (rev 205314)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-09-01 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Minification detection produces false positives for small resources
+ https://bugs.webkit.org/show_bug.cgi?id=161159
+ <rdar://problem/27995306>
+
+ Reviewed by Brian Burg.
+
+ Improve minification detection algorithm. Minified resources rarely have tabs and usually
+ have a very few line breaks. Counting tabs as 4 spaces and line breaks as 8 makes minification
+ detection heuristic more accurate. Increase ratio thresholds to accommodate for the changes in
+ whitespaceScore.
+
+ * UserInterface/Base/Utilities.js:
+ (isTextLikelyMinified):
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype._prepareEditorForInitialContent):
+ (WebInspector.SourceCodeTextEditor.prototype._isLikelyMinified): Deleted.
+
+2016-09-01 Nikita Vasilyev <nvasilyev@apple.com>
+
</ins><span class="cx"> REGRESSION (r201454): Web Inspector: Text caret isn't visible when editing an attribute
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160986
</span><span class="cx"> <rdar://problem/27916207>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (205313 => 205314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-09-01 20:40:23 UTC (rev 205313)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-09-01 21:04:49 UTC (rev 205314)
</span><span class="lines">@@ -1402,6 +1402,29 @@
</span><span class="cx"> return str.endsWith("{\n [native code]\n}");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function isTextLikelyMinified(content)
+{
+ const autoFormatMaxCharactersToCheck = 5000;
+ const autoFormatWhitespaceRatio = 0.2;
+
+ let whitespaceScore = 0;
+ let size = Math.min(autoFormatMaxCharactersToCheck, content.length);
+
+ for (let i = 0; i < size; i++) {
+ let char = content[i];
+
+ if (char === " ")
+ whitespaceScore++;
+ else if (char === "\t")
+ whitespaceScore += 4;
+ else if (char === "\n")
+ whitespaceScore += 8;
+ }
+
+ let ratio = whitespaceScore / size;
+ return ratio < autoFormatWhitespaceRatio;
+}
+
</ins><span class="cx"> function doubleQuotedString(str)
</span><span class="cx"> {
</span><span class="cx"> return "\"" + str.replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (205313 => 205314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-09-01 20:40:23 UTC (rev 205313)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-09-01 21:04:49 UTC (rev 205314)
</span><span class="lines">@@ -364,26 +364,6 @@
</span><span class="cx"> delete this._breakpointMap[lineInfo.lineNumber];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _isLikelyMinified(content)
- {
- let whiteSpaceCount = 0;
- let ratio = 0;
-
- for (let i = 0, size = Math.min(5000, content.length); i < size; i++) {
- let char = content[i];
- if (char === " " || char === "\n" || char === "\t")
- whiteSpaceCount++;
-
- if (i >= 500) {
- ratio = whiteSpaceCount / i;
- if (ratio < 0.05)
- return true;
- }
- }
-
- return ratio < 0.1;
- }
-
</del><span class="cx"> _populateWithContent(content)
</span><span class="cx"> {
</span><span class="cx"> content = content || "";
</span><span class="lines">@@ -464,7 +444,7 @@
</span><span class="cx">
</span><span class="cx"> // Decide to automatically format the content if it looks minified and it can be formatted.
</span><span class="cx"> console.assert(!this.formatted);
</span><del>- if (this.canBeFormatted() && this._isLikelyMinified(content)) {
</del><ins>+ if (this.canBeFormatted() && isTextLikelyMinified(content)) {
</ins><span class="cx"> this._autoFormat = true;
</span><span class="cx"> this._isProbablyMinified = true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>