Changeset 90617 in webkit


Ignore:
Timestamp:
Jul 8, 2011 4:16:24 AM (13 years ago)
Author:
apavlov@chromium.org
Message:

Web Inspector: Quotes are rendered as " in the DOM tree
​https://bugs.webkit.org/show_bug.cgi?id=64154

Reviewed by Yury Semikhatsky.

Source/WebCore:

Since we currently rely on setting textContent rather than innerHTML for the DOM tree elements,
escapeHTML() calls unnecessarily HTML-escape certain characters in the DOM tree contents.

  • inspector/front-end/ElementsTreeOutline.js:

(WebInspector.ElementsTreeElement.prototype._buildAttributeDOM):
():

LayoutTests:

  • inspector/elements/elements-panel-structure-expected.txt:
  • inspector/elements/elements-panel-structure.html:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r90614 r90617  
     12011-07-08  Alexander Pavlov  <apavlov@chromium.org>
     2
     3        Web Inspector: Quotes are rendered as &quot; in the DOM tree
     4        https://bugs.webkit.org/show_bug.cgi?id=64154
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        * inspector/elements/elements-panel-structure-expected.txt:
     9        * inspector/elements/elements-panel-structure.html:
     10
    1112011-07-08  Yury Semikhatsky  <yurys@chromium.org>
    212

  • trunk/LayoutTests/inspector/elements/elements-panel-structure-expected.txt

    r78576 r90617  
    1 Tests that elements panel shows dom tree structure.
     1Tests that elements panel shows DOM tree structure.
    22
    3 Text
     3"Quoted Text"
    44      <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
    55- <html>
    … …  
    1212      </head>
    1313    - <body onload="runTest()">
    14           <p>Tests that elements panel shows dom tree structure.</p>
     14          <p>Tests that elements panel shows DOM tree structure.</p>
    1515        - <div id="level1">
    1616            - <div id="level2">
    17                   "Text        "
     17                  ""Quoted Text"        "
    1818                  <div id="level3"></div>
    1919              </div>

  • trunk/LayoutTests/inspector/elements/elements-panel-structure.html

    r82713 r90617  
    2222<body onload="runTest()">
    2323<p>
    24 Tests that elements panel shows dom tree structure.
     24Tests that elements panel shows DOM tree structure.
    2525</p>
    2626
    2727<div id="level1">
    28     <div id="level2">Text
     28    <div id="level2">"Quoted Text"
    2929        <div id="level3"></div>
    3030    </div>

  • trunk/Source/WebCore/ChangeLog

    r90616 r90617  
     12011-07-08  Alexander Pavlov  <apavlov@chromium.org>
     2
     3        Web Inspector: Quotes are rendered as &quot; in the DOM tree
     4        https://bugs.webkit.org/show_bug.cgi?id=64154
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        Since we currently rely on setting textContent rather than innerHTML for the DOM tree elements,
     9        escapeHTML() calls unnecessarily HTML-escape certain characters in the DOM tree contents.
     10
     11        * inspector/front-end/ElementsTreeOutline.js:
     12        (WebInspector.ElementsTreeElement.prototype._buildAttributeDOM):
     13        ():
     14
    1152011-07-08  Vsevolod Vlasov  <vsevik@chromium.org>
    216

  • trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js

    r90561 r90617  
    13651365        var attrSpanElement = parentElement.createChild("span", "webkit-html-attribute");
    13661366        var attrNameElement = attrSpanElement.createChild("span", "webkit-html-attribute-name");
    1367         attrNameElement.textContent = name.escapeHTML();
     1367        attrNameElement.textContent = name;
    13681368
    13691369        if (hasText)
    … …  
    13751375            attrSpanElement.appendChild(linkify(rewrittenHref, value, "webkit-html-attribute-value", node.nodeName().toLowerCase() === "a"));
    13761376        } else {
    1377             value = value.escapeHTML().replace(/([\/;:\)\]\}])/g, "$1\u200B");
     1377            value = value.replace(/([\/;:\)\]\}])/g, "$1\u200B");
    13781378            var attrValueElement = attrSpanElement.createChild("span", "webkit-html-attribute-value");
    13791379            attrValueElement.textContent = value;
    … …  
    14261426
    14271427            case Node.ELEMENT_NODE:
    1428                 var tagName = this.treeOutline.nodeNameToCorrectCase(node.nodeName()).escapeHTML();
     1428                var tagName = this.treeOutline.nodeNameToCorrectCase(node.nodeName());
    14291429                if (this._elementCloseTag) {
    14301430                    this._buildTagDOM(info.titleDOM, tagName, true, true);
    … …  
    14521452                if (showInlineText) {
    14531453                    var textNodeElement = info.titleDOM.createChild("span", "webkit-html-text-node");
    1454                     textNodeElement.textContent = textChild.nodeValue().escapeHTML();
     1454                    textNodeElement.textContent = textChild.nodeValue();
    14551455                    info.titleDOM.appendChild(document.createTextNode("\u200B"));
    14561456                    this._buildTagDOM(info.titleDOM, tagName, true, false);
    … …  
    14781478                        info.titleDOM.appendChild(document.createTextNode("\""));
    14791479                        var textNodeElement = info.titleDOM.createChild("span", "webkit-html-text-node");
    1480                         textNodeElement.textContent = node.nodeValue().escapeHTML();
     1480                        textNodeElement.textContent = node.nodeValue();
    14811481                        info.titleDOM.appendChild(document.createTextNode("\""));
    14821482                    }
    … …  
    14861486            case Node.COMMENT_NODE:
    14871487                var commentElement = info.titleDOM.createChild("span", "webkit-html-comment");
    1488                 commentElement.appendChild(document.createTextNode("<!--" + node.nodeValue().escapeHTML() + "-->"));
     1488                commentElement.appendChild(document.createTextNode("<!--" + node.nodeValue() + "-->"));
    14891489                break;
    14901490
    … …  
    15071507            case Node.CDATA_SECTION_NODE:
    15081508                var cdataElement = info.titleDOM.createChild("span", "webkit-html-text-node");
    1509                 cdataElement.appendChild(document.createTextNode("<![CDATA[" + node.nodeValue().escapeHTML() + "]]>"));
     1509                cdataElement.appendChild(document.createTextNode("<![CDATA[" + node.nodeValue() + "]]>"));
    15101510                break;
    15111511            default:
    1512                 var defaultElement = info.titleDOM.appendChild(document.createTextNode(this.treeOutline.nodeNameToCorrectCase(node.nodeName()).collapseWhitespace().escapeHTML()));
     1512                var defaultElement = info.titleDOM.appendChild(document.createTextNode(this.treeOutline.nodeNameToCorrectCase(node.nodeName()).collapseWhitespace()));
    15131513        }
    15141514
Note: See TracChangeset for help on using the changeset viewer.