[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[apavlov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 1657302b56dc79aa65826d08b7a870c09ab55454
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 12:21:02 2010 +0000

    2010-07-20  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Inspector: Resources Search Should Search Only Filtered Resources
            https://bugs.webkit.org/show_bug.cgi?id=28290
    
            * inspector/front-end/AbstractTimelinePanel.js:
            (WebInspector.AbstractTimelinePanel.prototype._updateFilter):
            * inspector/front-end/ResourcesPanel.js:
            (WebInspector.ResourcesPanel.prototype.get searchableViews):
            * inspector/front-end/inspector.js:
            (WebInspector.performSearch):
            (WebInspector.doPerformSearch):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63741 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3a6f48f..3a4b25d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,21 @@
 
         Reviewed by Pavel Feldman.
 
+        Inspector: Resources Search Should Search Only Filtered Resources
+        https://bugs.webkit.org/show_bug.cgi?id=28290
+
+        * inspector/front-end/AbstractTimelinePanel.js:
+        (WebInspector.AbstractTimelinePanel.prototype._updateFilter):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.get searchableViews):
+        * inspector/front-end/inspector.js:
+        (WebInspector.performSearch):
+        (WebInspector.doPerformSearch):
+
+2010-07-20  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
         Web Inspector: Incorrect absolute URLs in tooltips of links in the ElementsTreeOutline
         https://bugs.webkit.org/show_bug.cgi?id=42626
 
diff --git a/WebCore/inspector/front-end/AbstractTimelinePanel.js b/WebCore/inspector/front-end/AbstractTimelinePanel.js
index 1b5f6ce..187ef86 100644
--- a/WebCore/inspector/front-end/AbstractTimelinePanel.js
+++ b/WebCore/inspector/front-end/AbstractTimelinePanel.js
@@ -202,6 +202,9 @@ WebInspector.AbstractTimelinePanel.prototype = {
         // When we are updating our filtering, scroll to the top so we don't end up
         // in blank graph under all the resources.
         this.containerElement.scrollTop = 0;
+
+        var searchField = document.getElementById("search");
+        WebInspector.doPerformSearch(searchField.value, WebInspector.shortSearchWasForcedByKeyEvent, false, true);
     },
 
     updateGraphDividersIfNeeded: function(force)
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index 547774d..b02a277 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -228,7 +228,7 @@ WebInspector.ResourcesPanel.prototype = {
         var resourcesLength = this._resources.length;
         for (var i = 0; i < resourcesLength; ++i) {
             var resource = this._resources[i];
-            if (!resource._itemsTreeElement)
+            if (!resource._itemsTreeElement || !resource._itemsTreeElement.selectable)
                 continue;
             var resourceView = this.resourceViewForResource(resource);
             if (!resourceView.performSearch || resourceView === visibleView)
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 4ccdf6f..5ec7081 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1843,8 +1843,12 @@ WebInspector._searchKeyDown = function(event)
 
 WebInspector.performSearch = function(event)
 {
-    var query = event.target.value;
     var forceSearch = event.keyIdentifier === "Enter";
+    this.doPerformSearch(event.target.value, forceSearch, event.shiftKey, false);
+}
+
+WebInspector.doPerformSearch = function(query, forceSearch, isBackwardSearch, repeatSearch)
+{
     var isShortSearch = (query.length < 3);
 
     // Clear a leftover short search flag due to a non-conflicting forced search.
@@ -1876,14 +1880,13 @@ WebInspector.performSearch = function(event)
         return;
     }
 
-    if (query === this.currentPanel.currentQuery && this.currentPanel.currentQuery === this.currentQuery) {
+    if (!repeatSearch && query === this.currentPanel.currentQuery && this.currentPanel.currentQuery === this.currentQuery) {
         // When this is the same query and a forced search, jump to the next
         // search result for a good user experience.
         if (forceSearch) {
-            var backward = event.shiftKey;
-            if (!backward && this.currentPanel.jumpToNextSearchResult)
+            if (!isBackwardSearch && this.currentPanel.jumpToNextSearchResult)
                 this.currentPanel.jumpToNextSearchResult();
-            else if (backward && this.currentPanel.jumpToPreviousSearchResult)
+            else if (isBackwardSearch && this.currentPanel.jumpToPreviousSearchResult)
                 this.currentPanel.jumpToPreviousSearchResult();
         }
         return;

-- 
WebKit Debian packaging