Attachment 175978 Details for Bug 100095 – Patch

[patch] Patch

bug-100095-20121126144541.patch (text/plain), 8.92 KB, created by Mike West on 2012-11-26 05:48:03 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Mike West

Created: 2012-11-26 05:48:03 PST

Size: 8.92 KB

patch

obsolete

>Subversion Revision: 135699
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 45f8cf9112c8459beed991b788d8fde5c7781c3a..1799e29929a4f00990e7e2928f42b66194a2492c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,33 @@
>+2012-11-26  Mike West  <mkwst@chromium.org>
>+
>+        Web Inspector: Console message's anchor element should be trimmed for readability.
>+        https://bugs.webkit.org/show_bug.cgi?id=100095
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We're currently trimming URLs that go through
>+        'WebInspector.linkifyURLAsNode' down to 150 characters total. Not all
>+        URLs go that path, however. We were missing a few cases that dropped
>+        back to the default Linkifier (which especially showed up for "Live"
>+        anchor elements).
>+
>+        This patch ensures that anything using WebInspector.Linkifier is also
>+        trimmed by default. It adds a new constant to the WebInspector object to
>+        do so (in order to avoid magic numbers in the code).
>+
>+        Test: http/tests/inspector/network/script-as-text-loading-long-url.html
>+
>+        * inspector/front-end/Linkifier.js:
>+        (WebInspector.Linkifier):
>+            Pass the max length into the default formatter that's created and
>+            stored when creating a 'WebInspector.Linkifier' object.
>+        * inspector/front-end/ResourceUtils.js:
>+        (WebInspector.linkifyURLAsNode):
>+            Use the new maxlength constant rather than hard-coding 150.
>+        * inspector/front-end/inspector.js:
>+        (WebInspector):
>+            New constant! How exciting!
>+
> 2012-11-26  Hajime Morrita  <morrita@google.com>
> 
>         [Refactoring] Some Node::isDescendant calls can be replaced with Node::contains()
>diff --git a/Source/WebCore/inspector/front-end/Linkifier.js b/Source/WebCore/inspector/front-end/Linkifier.js
>index a4b5c91173a7d1016b3bf894b09a3957da4aaf85..780af4d6d4bac5b48502ab4c8c8695e157f927ab 100644
>--- a/Source/WebCore/inspector/front-end/Linkifier.js
>+++ b/Source/WebCore/inspector/front-end/Linkifier.js
>@@ -49,7 +49,7 @@ WebInspector.LinkifierFormatter.prototype = {
>  */
> WebInspector.Linkifier = function(formatter)
> {
>-    this._formatter = formatter || new WebInspector.Linkifier.DefaultFormatter();
>+    this._formatter = formatter || new WebInspector.Linkifier.DefaultFormatter(WebInspector.MaxLengthForDisplayedURLs);
>     this._liveLocations = [];
> }
> 
>@@ -138,8 +138,10 @@ WebInspector.Linkifier.DefaultFormatter.prototype = {
>     formatLiveAnchor: function(anchor, uiLocation)
>     {
>         var text = WebInspector.formatLinkText(uiLocation.uiSourceCode.url, uiLocation.lineNumber);
>+        /*
>         if (this._maxLength)
>             text = text.trimMiddle(this._maxLength);
>+        */
>         anchor.textContent = text;
> 
>         var titleText = uiLocation.uiSourceCode.url;
>@@ -173,4 +175,4 @@ WebInspector.Linkifier.DefaultCSSFormatter.prototype = {
>         anchor.textContent = "";
>     },
>     __proto__: WebInspector.Linkifier.DefaultFormatter.prototype
>-}
>\ No newline at end of file
>+}
>diff --git a/Source/WebCore/inspector/front-end/ResourceUtils.js b/Source/WebCore/inspector/front-end/ResourceUtils.js
>index 01b47f5d17a1c7b7a213226f72de7a7c9056fb5c..0184ff7b1b80975298bb1e73cdb1822a0c1b781d 100644
>--- a/Source/WebCore/inspector/front-end/ResourceUtils.js
>+++ b/Source/WebCore/inspector/front-end/ResourceUtils.js
>@@ -181,7 +181,7 @@ WebInspector.linkifyURLAsNode = function(url, linkText, classes, isExternal, too
>         a.title = url;
>     else if (typeof tooltipText !== "string" || tooltipText.length)
>         a.title = tooltipText;
>-    a.textContent = linkText.trimMiddle(150);
>+    a.textContent = linkText.trimMiddle(WebInspector.MaxLengthForDisplayedURLs);
>     if (isExternal)
>         a.setAttribute("target", "_blank");
> 
>diff --git a/Source/WebCore/inspector/front-end/inspector.css b/Source/WebCore/inspector/front-end/inspector.css
>index ed979b3aec301ae2cc52bf189ceb5cb5c1104b5b..54bb4695b5d75e7e0559625daf1cfd97f2f25357 100644
>--- a/Source/WebCore/inspector/front-end/inspector.css
>+++ b/Source/WebCore/inspector/front-end/inspector.css
>@@ -1067,6 +1067,7 @@ ol.watch-expressions > li.hovered {
> 
> .console-message-url {
>     float: right;
>+    text-align: right;
>     max-width: 100%;
>     margin-left: 4px;
> }
>diff --git a/Source/WebCore/inspector/front-end/inspector.js b/Source/WebCore/inspector/front-end/inspector.js
>index 3edf3c5c02b6199f2f1f79ddcdfd9b860da8625d..d22fabca4d24b7aab316af72ec6d1ee7dd4ac1b9 100644
>--- a/Source/WebCore/inspector/front-end/inspector.js
>+++ b/Source/WebCore/inspector/front-end/inspector.js
>@@ -992,4 +992,6 @@ WebInspector.ProfileURLRegExp = /webkit-profile:\/\/(.+)\/(.+)#([0-9]+)/;
> WebInspector.Zoom = {
>     Table: [0.25, 0.33, 0.5, 0.66, 0.75, 0.9, 1, 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5],
>     DefaultOffset: 6
>-}
>+};
>+
>+WebInspector.MaxLengthForDisplayedURLs = 150;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 97e75317e965f5608ddb0d60324caad7b57a9ddf..840528961235a6fa07a413ec208dc7c211ccb78a 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2012-11-26  Mike West  <mkwst@chromium.org>
>+
>+        Web Inspector: Console message's anchor element should be trimmed for readability.
>+        https://bugs.webkit.org/show_bug.cgi?id=100095
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * http/tests/inspector/network/resources/script-as-text-with-a-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long-url.php: Added.
>+        * http/tests/inspector/network/script-as-text-loading-long-url-expected.txt: Added.
>+        * http/tests/inspector/network/script-as-text-loading-long-url.html: Added.
>+
> 2012-11-26  JÃ¡nos Badics  <jbadics@inf.u-szeged.hu>
> 
>         [Qt] Gardening after r135629. Skipped a newly added but failing test.
>diff --git a/LayoutTests/http/tests/inspector/network/resources/script-as-text-with-a-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long-url.php b/LayoutTests/http/tests/inspector/network/resources/script-as-text-with-a-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long-url.php
>new file mode 100644
>index 0000000000000000000000000000000000000000..2d318ecc3135616b2e0f22b92bf95b9f7722bb5e
>--- /dev/null
>+++ b/LayoutTests/http/tests/inspector/network/resources/script-as-text-with-a-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long-url.php
>@@ -0,0 +1,8 @@
>+<?php
>+    header("Content-Type: text/plain");
>+?>
>+
>+function foo()
>+{
>+    var bar = 42;
>+}
>diff --git a/LayoutTests/http/tests/inspector/network/script-as-text-loading-long-url-expected.txt b/LayoutTests/http/tests/inspector/network/script-as-text-loading-long-url-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..4590e099d0b5f9d1788ec281f2cf11922d1cd10a
>--- /dev/null
>+++ b/LayoutTests/http/tests/inspector/network/script-as-text-loading-long-url-expected.txt
>@@ -0,0 +1,5 @@
>+Tests console message when script with a very very very long URL is loaded with incorrect text/html mime type.
>+
>+Bug 100095
>+Resource interpreted as Script but transferred with MIME type text/plain: "http://127.0.0.1:8000/inspector/network/resources/â¦y-very-very-very-very-very-very-very-long-url.php". [native code]:1
>+
>diff --git a/LayoutTests/http/tests/inspector/network/script-as-text-loading-long-url.html b/LayoutTests/http/tests/inspector/network/script-as-text-loading-long-url.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3b884857197213165cb31143d375c933ac771fd5
>--- /dev/null
>+++ b/LayoutTests/http/tests/inspector/network/script-as-text-loading-long-url.html
>@@ -0,0 +1,30 @@
>+<html>
>+<head>
>+<script src="../inspector-test.js"></script>
>+<script src="../console-test.js"></script>
>+<script>
>+function loadScript()
>+{
>+    var i = document.createElement('script');
>+    i.src = "/inspector/network/resources/script-as-text-with-a-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-very-long-url.php";
>+    document.body.appendChild(i);
>+}
>+
>+function test()
>+{
>+    InspectorTest.addConsoleSniffer(step1);
>+    InspectorTest.evaluateInPage("loadScript()");
>+
>+    function step1()
>+    {
>+        InspectorTest.dumpConsoleMessages();
>+        InspectorTest.completeTest();
>+    }
>+}
>+</script>
>+</head>
>+<body onload="runTest()">
>+<p>Tests that long URLs are correctly trimmed in anchor links.</p>
>+<a href="https://bugs.webkit.org/show_bug.cgi?id=100095">Bug 100095</a>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 100095: 170091 | 175976 | 175977 | 175978 | 175997 | 176202 | 176508