2011-04-22 Nate Chapin <japhet@chromium.org>

natechapin · natechapin · commit 1f91feebbc3b · 2011-04-23T03:20:07.000Z
Reviewed by Adam Barth. Don't use XMLTreeViewer when script is disabled (it uses Javascript to build a prettified version of the xml document). https://bugs.webkit.org/show_bug.cgi?id=59113 * xml/XMLTreeViewer.cpp: (WebCore::XMLTreeViewer::transformDocumentToTreeView): Canonical link: https://commits.webkit.org/74461@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84732 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-04-22  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Don't use XMLTreeViewer when script is disabled (it uses Javascript
+        to build a prettified version of the xml document).
+        https://bugs.webkit.org/show_bug.cgi?id=59113
+
+        * xml/XMLTreeViewer.cpp:
+        (WebCore::XMLTreeViewer::transformDocumentToTreeView):
+
 2011-04-22  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r84725 and r84728.
diff --git a/Source/WebCore/xml/XMLTreeViewer.cpp b/Source/WebCore/xml/XMLTreeViewer.cpp
@@ -69,6 +69,12 @@ bool XMLTreeViewer::hasNoStyleInformation() const
 
 void XMLTreeViewer::transformDocumentToTreeView()
 {
+    // FIXME: Temporary hack to ensure that we still display some of the document (and don't crash)
+    // when script is disabled. See https://bugs.webkit.org/show_bug.cgi?id=59113 for work on a
+    // better solution.
+    if (!m_document->frame()->script()->canExecuteScripts(NotAboutToExecuteScript))
+        return;
+
     String scriptString(reinterpret_cast<const char*>(XMLViewer_js), sizeof(XMLViewer_js));
     m_document->frame()->script()->evaluate(ScriptSourceCode(scriptString));
     String noStyleMessage("This XML file does not appear to have any style information associated with it. The document tree is shown below.");
