Merge 92835 - Web Inspector: [REGRESSION] Resources panel search fails when search result is foun...

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 708 matching lines @@
         function callback(error, result)
         {
             if (!error) {
                 for (var i = 0; i < result.length; i++) {
                     var searchResult = result[i];
                     var frameTreeElement = this._treeElementForFrameId[searchResult.frameId];
                     if (!frameTreeElement)
                         continue;
                     var resource = frameTreeElement.resourceByURL(searchResult.url);
 
+                    // FIXME: When the same script is used in several frames and this script contains at least 
+                    // one search result then some search results can not be matched with a resource on panel.
+                    // https://bugs.webkit.org/show_bug.cgi?id=66005 
+                    if (!resource)
+                        continue;
+                    
                     if (resource.history.length > 0)
                         continue; // Skip edited resources.
                     this._findTreeElementForResource(resource).searchMatchesFound(searchResult.matchesCount);
                     totalMatchesCount += searchResult.matchesCount;
                 }
             }
             
             WebInspector.searchController.updateSearchMatchesCount(totalMatchesCount, this);
             this._searchController = new WebInspector.ResourcesSearchController(this.resourcesListTreeElement);
 
@@ skipping 384 matching lines @@
         }
         var resourceTreeElement = new WebInspector.FrameResourceTreeElement(this._storagePanel, resource);
         this._insertInPresentationOrder(categoryElement, resourceTreeElement);
         resourceTreeElement._populateRevisions();
 
         this._treeElementForResource[resource.url] = resourceTreeElement;
     },
 
     resourceByURL: function(url)
     {
-        return this._treeElementForResource[url].representedObject;
+        var treeElement = this._treeElementForResource[url];
+        return treeElement ? treeElement.representedObject : null;
     },
 
     appendChild: function(treeElement)
     {
         this._insertInPresentationOrder(this, treeElement);
     },
 
     _insertInPresentationOrder: function(parentTreeElement, childTreeElement)
     {
         // Insert in the alphabetical order, first frames, then resources. Document resource goes last.
@@ skipping 576 matching lines @@
 
     _lastTreeElement: function()
     {
         var treeElement = this._root;
         var nextTreeElement; 
         while (nextTreeElement = this._traverseNext(treeElement))
             treeElement = nextTreeElement;
         return treeElement;        
     }
 }