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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 15:36:33 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 210f566de3a8c3b3bf176f5a03cb3cea943acf29
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 04:47:55 2010 +0000

    2010-11-08  Jenn Braithwaite  <jennb at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            _bindResourceURL in ResourceManager.js may not add resource to map
            https://bugs.webkit.org/show_bug.cgi?id=49088
    
            No new tests. pfeldman working on better test harness and tests.
    
            * inspector/front-end/ResourceManager.js:
            (WebInspector.ResourceManager.prototype._bindResourceURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71603 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 11c9b3f..a8390d7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-08  Jenn Braithwaite  <jennb at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        _bindResourceURL in ResourceManager.js may not add resource to map
+        https://bugs.webkit.org/show_bug.cgi?id=49088
+
+        No new tests. pfeldman working on better test harness and tests.
+
+        * inspector/front-end/ResourceManager.js:
+        (WebInspector.ResourceManager.prototype._bindResourceURL):
+
 2010-11-08  John Knottenbelt  <jknotten at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebCore/inspector/front-end/ResourceManager.js b/WebCore/inspector/front-end/ResourceManager.js
index bb34561..d1220a2 100644
--- a/WebCore/inspector/front-end/ResourceManager.js
+++ b/WebCore/inspector/front-end/ResourceManager.js
@@ -404,7 +404,7 @@ WebInspector.ResourceManager.prototype = {
         else if (resourceForURL instanceof Array)
             resourceForURL.push(resource);
         else
-            this._resourcesByURL[resource.url] = [resourceForURL];
+            this._resourcesByURL[resource.url] = [resourceForURL, resource];
     },
 
     _unbindResourceURL: function(resource)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list