Changeset 151080 in webkit

Timestamp:

Jun 2, 2013 1:14:48 AM (11 years ago)

Author:

ap@apple.com

Message:

Unstyled XML viewer crashes when XML contains an element with id="tree"
​https://bugs.webkit.org/show_bug.cgi?id=117117
<rdar://problem/13727267>

Reviewed by Darin Adler.

Source/WebCore:

Test: http/tests/xmlviewer/dumpAsText/existing-tree-element-crash.xml

• xml/XMLViewer.css: Removed the rule to hide source document, as we no longer

keep it in the tree.

• xml/XMLViewer.js:

(prepareWebKitXMLViewer): Make sourceXML a detached tree, as otherwise it can
have ID conflicts with elements we add.
(sourceXMLLoaded): Removed some commented out code. Removed code that was checking
whether an extension took over XML display, as it makes no sense to duplicate this
functionality in an extension.

LayoutTests:

• http/tests/xmlviewer/dumpAsText/existing-tree-element-crash-expected.txt: Added.
• http/tests/xmlviewer/dumpAsText/existing-tree-element-crash.xml: Added.

• xmlviewer: Removed.
• xmlviewer/extensions-api-expected.txt: Removed.
• xmlviewer/extensions-api.html: Removed.
• xmlviewer/resources: Removed.
• xmlviewer/resources/sample.xml: Removed.

The "API" no longer exists.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/xmlviewer/dumpAsText/existing-tree-element-crash-expected.txt (added)
• LayoutTests/http/tests/xmlviewer/dumpAsText/existing-tree-element-crash.xml (added)
• LayoutTests/xmlviewer/extensions-api-expected.txt (deleted)
• LayoutTests/xmlviewer/extensions-api.html (deleted)
• LayoutTests/xmlviewer/resources/sample.xml (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/xml/XMLViewer.css (modified) (1 diff)
• Source/WebCore/xml/XMLViewer.js (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-06-02  Alexey Proskuryakov  <ap@apple.com>
+
+        Unstyled XML viewer crashes when XML contains an element with id="tree"
+        https://bugs.webkit.org/show_bug.cgi?id=117117
+        <rdar://problem/13727267>
+
+        Reviewed by Darin Adler.
+
+        * http/tests/xmlviewer/dumpAsText/existing-tree-element-crash-expected.txt: Added.
+        * http/tests/xmlviewer/dumpAsText/existing-tree-element-crash.xml: Added.
+
+        * xmlviewer: Removed.
+        * xmlviewer/extensions-api-expected.txt: Removed.
+        * xmlviewer/extensions-api.html: Removed.
+        * xmlviewer/resources: Removed.
+        * xmlviewer/resources/sample.xml: Removed.
+        The "API" no longer exists.
+
 2013-06-01  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-02  Alexey Proskuryakov  <ap@apple.com>
+
+        Unstyled XML viewer crashes when XML contains an element with id="tree"
+        https://bugs.webkit.org/show_bug.cgi?id=117117
+        <rdar://problem/13727267>
+
+        Reviewed by Darin Adler.
+
+        Test: http/tests/xmlviewer/dumpAsText/existing-tree-element-crash.xml
+
+        * xml/XMLViewer.css: Removed the rule to hide source document, as we no longer
+        keep it in the tree.
+
+        * xml/XMLViewer.js:
+        (prepareWebKitXMLViewer): Make sourceXML a detached tree, as otherwise it can
+        have ID conflicts with elements we add.
+        (sourceXMLLoaded): Removed some commented out code. Removed code that was checking
+        whether an extension took over XML display, as it makes no sense to duplicate this
+        functionality in an extension.
+
 2013-06-01  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/xml/XMLViewer.css

@@ -44 +44 @@
 }
 
-#webkit-xml-viewer-source-xml {
-    display: none;
-}
-
 .collapsible-content {
     margin-left: 1em;

trunk/Source/WebCore/xml/XMLViewer.js

@@ -1 +1 @@
 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +29 @@
 
 var nodeParentPairs = [];
+var sourceXML;
 
 // Script entry point.
@@ -41 +43 @@
     var body = createHTMLElement('body');
     html.appendChild(body);
-    var sourceXML = createHTMLElement('div');
-    sourceXML.id = 'webkit-xml-viewer-source-xml';
-    body.appendChild(sourceXML);
+    sourceXML = createHTMLElement('div');
 
     var child;
@@ -70 +70 @@
 function sourceXMLLoaded()
 {
-    var sourceXML = document.getElementById('webkit-xml-viewer-source-xml');
-    if (!sourceXML)
-        return; // Stop if some XML tree extension is already processing this document
-    //var style = document.head.firstChild;
-    //document.head.removeChild(style);
-    //document.head.appendChild(style);
     var root = document.getElementById('tree');