Merge 98105 - Web Inspector: Advanced search is working very slowly and does not show searching p...

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

 /*
  * Copyright (C) 2007, 2008 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 56 matching lines @@
     },
 
     _constrainHeight: function(height)
     {
         return Number.constrain(height, Preferences.minConsoleHeight, window.innerHeight - this._mainElement.totalOffsetTop() - Preferences.minConsoleHeight);
     },
 
     show: function(view, animationType)
     {
         this.immediatelyFinishAnimation();
+        if (this._view && this._view.counterElement)
+            this._view.counterElement.parentNode.removeChild(this._view.counterElement);
 
         var drawerWasVisible = this.visible;
         
         if (this._view) {
             this._drawerContentsElement.removeChildren();
             this._view.hide();
         }
 
         this._view = view;
 
         var statusBarItems = this._view.statusBarItems || [];
         this._viewStatusBar.removeChildren();
         for (var i = 0; i < statusBarItems.length; ++i)
             this._viewStatusBar.appendChild(statusBarItems[i]);
 
+        if (this._view.counterElement)
+            this._counters.insertBefore(this._view.counterElement, this._counters.firstChild);
+
         document.body.addStyleClass("drawer-visible");
         this._view.show(this._drawerContentsElement);
 
         if (drawerWasVisible)
             return;
         
         var anchoredItems = document.getElementById("anchored-status-bar-items");
         var height = this._constrainHeight(this._savedHeight || this.element.offsetHeight);
         var animations = [
             {element: this.element, end: {height: height}},
             {element: this._mainElement, end: {bottom: height}},
             {element: this._mainStatusBar, start: {"padding-left": anchoredItems.offsetWidth - 1}, end: {"padding-left": 0}},
             {element: this._viewStatusBar, start: {opacity: 0}, end: {opacity: 1}}
         ];
 
         this._drawerStatusBar.insertBefore(anchoredItems, this._drawerStatusBar.firstChild);
 
         if (this._currentPanelCounters) {
             var oldRight = this._drawerStatusBar.clientWidth - (this._counters.offsetLeft + this._currentPanelCounters.offsetWidth);
             var newRight = WebInspector.Panel.counterRightMargin;
             var rightPadding = (oldRight - newRight);
             animations.push({element: this._currentPanelCounters, start: {"padding-right": rightPadding}, end: {"padding-right": 0}});
             this._currentPanelCounters.parentNode.removeChild(this._currentPanelCounters);
             this._mainStatusBar.appendChild(this._currentPanelCounters);
         }
-
+        
         function animationFinished()
         {
             WebInspector.currentPanel().statusBarResized();
             if (this._view && this._view.afterShow)
                 this._view.afterShow();
             delete this._currentAnimation;
             if (this._currentPanelCounters)
                 this._currentPanelCounters.removeAttribute("style");
         }
 
@@ skipping 34 matching lines @@
             var rightPadding = (newRight - oldRight);
             animations.push({element: this._currentPanelCounters, start: {"padding-right": 0}, end: {"padding-right": rightPadding}});
         }
 
         function animationFinished()
         {
             WebInspector.currentPanel().doResize();
             this._mainStatusBar.insertBefore(anchoredItems, this._mainStatusBar.firstChild);
             this._mainStatusBar.style.removeProperty("padding-left");
 
+            if (this._view.counterElement)
+                this._view.counterElement.parentNode.removeChild(this._view.counterElement);
+
             if (this._currentPanelCounters) {
                 this._currentPanelCounters.setAttribute("style", null);
                 this._currentPanelCounters.parentNode.removeChild(this._currentPanelCounters);
                 this._counters.insertBefore(this._currentPanelCounters, this._counters.firstChild);
             }
 
             this._view.hide();
             this._drawerContentsElement.removeChildren();
             delete this._view;
             document.body.removeStyleClass("drawer-visible");
@@ skipping 87 matching lines @@
         delete this._statusBarDragOffset;
 
         event.stopPropagation();
     }
 }
 
 /**
  * @type {WebInspector.Drawer}
  */
 WebInspector.drawer = null;