Merge 77480 - 2011-02-03 Pavel Feldman <pfeldman@chromium.org>...

Source/WebCore/inspector/front-end/ResourcesPanel.js

 /*
  * Copyright (C) 2007, 2008, 2010 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 87 matching lines @@
         return [this.sidebarElement];
     },
 
     show: function()
     {
         WebInspector.Panel.prototype.show.call(this);
 
         if (this.visibleView instanceof WebInspector.ResourceView)
             this._showResourceView(this.visibleView.resource);
 
+        this._initDefaultSelection();
+    },
+
+    loadEventFired: function()
+    {
+        this._initDefaultSelection();
+    },
+
+    _initDefaultSelection: function()
+    {
         if (this._initializedDefaultSelection)
             return;
 
         this._initializedDefaultSelection = true;
         var itemURL = WebInspector.settings.resourcesLastSelectedItem;
         if (itemURL) {
             for (var treeElement = this.sidebarTree.children[0]; treeElement; treeElement = treeElement.traverseNextTreeElement(false, this.sidebarTree, true)) {
                 if (treeElement.itemURL === itemURL) {
                     treeElement.select();
                     treeElement.reveal();
                     return;
                 }
             }
         }
-        this._initDefaultSelection();
-    },
 
-    _initDefaultSelection: function()
-    {
         if (WebInspector.mainResource && this.resourcesListTreeElement && this.resourcesListTreeElement.expanded)
             this.showResource(WebInspector.mainResource);
     },
 
     reset: function()
     {
+        delete this._initializedDefaultSelection;
         this._origins = {};
         this._domains = {};
         for (var i = 0; i < this._databases.length; ++i) {
             var database = this._databases[i];
             delete database._tableViews;
             delete database._queryView;
         }
         this._databases = [];
 
         var domStorageLength = this._domStorage.length;
@@ skipping 20 matching lines @@
 
         this.storageViewStatusBarItemsContainer.removeChildren();
 
         if (this.sidebarTree.selectedTreeElement)
             this.sidebarTree.selectedTreeElement.deselect();
     },
 
     clear: function()
     {
         this.resourcesListTreeElement.removeChildren();
+        this._treeElementForFrameId = {};
         this.reset();
     },
 
     addOrUpdateFrame: function(parentFrameId, frameId, title, subtitle)
     {
         var frameTreeElement = this._treeElementForFrameId[frameId];
         if (frameTreeElement) {
             frameTreeElement.setTitles(title, subtitle);
             return;
         }
@@ skipping 1125 matching lines @@
 }
 
 WebInspector.StorageCategoryView.prototype = {
     setText: function(text)
     {
         this._emptyMsgElement.textContent = text;
     }
 }
 
 WebInspector.StorageCategoryView.prototype.__proto__ = WebInspector.View.prototype;