2 files changed, 11 insertions, 13 deletions
diff --git a/webkit/glue/devtools/js/debugger_agent.js b/webkit/glue/devtools/js/debugger_agent.js
index 647a84b..fe9e72b 100644
--- a/webkit/glue/devtools/js/debugger_agent.js
+++ b/webkit/glue/devtools/js/debugger_agent.js
@@ -290,18 +290,8 @@ devtools.DebuggerAgent.prototype.handleScriptsResponse_ = function(msg) {
     this.parsedScripts_[script.id] = new devtools.ScriptInfo(
         script.id, script.lineOffset);
     
-    var name = script.name;
-    if (name.indexOf('http') == 0) {
-      var slash = name.lastIndexOf('/');
-      if (slash != -1) {
-        name = name.substr(slash + 1);
-      }
-    }
-    if (name.length > 100) {
-      name = name.substr(0, 50) + '...' + name.substr(name.length - 50);
-    }
     WebInspector.parsedScriptSource(
-        script.id, name, script.source, script.lineOffset);
+        script.id, script.name, script.source, script.lineOffset);
   }
 };
 
diff --git a/webkit/glue/devtools/js/dom_agent.js b/webkit/glue/devtools/js/dom_agent.js
index 31d13a7..c33b03f 100644
--- a/webkit/glue/devtools/js/dom_agent.js
+++ b/webkit/glue/devtools/js/dom_agent.js
@@ -692,12 +692,13 @@ devtools.DomAgent.prototype.getNodeForId = function(nodeId) {
 devtools.DomAgent.prototype.setDocumentElement = function(payload) {
   var doc = this.getDocument();
   if (doc.documentElement) {
-    return;
+    this.reset();
+    doc = this.getDocument();
   }
   this.setChildNodes(0, [payload]);
   doc.documentElement = doc.firstChild;
   doc.documentElement.ownerDocument = doc;
-  doc.fireDomEvent_("DOMContentLoaded");
+  WebInspector.panels.elements.reset();
 };
 
 
@@ -735,6 +736,13 @@ devtools.DomAgent.prototype.bindNodes_ = function(children) {
  * {@inheritDoc}.
  */
 devtools.DomAgent.prototype.hasChildrenUpdated = function(nodeId, newValue) {
+  var node = this.idToDomNode_[nodeId];
+  var outline = WebInspector.panels.elements.treeOutline;
+  var treeElement = outline.findTreeElement(node);
+  if (treeElement) {
+    treeElement.hasChildren = newValue;
+    treeElement.whitespaceIgnored = Preferences.ignoreWhitespace;
+  }
 };