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

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 1d2cc18ed90a341ff06c23edd82bf01f0168b6b3
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 7 06:26:36 2010 +0000

    2010-11-06  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Simon Fraser.
    
            Web Inspector: Some image resources don't display the image when selected in the Resources panel.
            https://bugs.webkit.org/show_bug.cgi?id=48935
    
            Marked resources loaded from memory cache as finished.
    
            * inspector/front-end/ResourceManager.js:
            (WebInspector.ResourceManager.prototype.didLoadResourceFromMemoryCache):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71477 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f7a6eb..df25c27 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
 2010-11-06  Pavel Feldman  <pfeldman at chromium.org>
 
+        Reviewed by Simon Fraser.
+
+        Web Inspector: Some image resources don't display the image when selected in the Resources panel.
+        https://bugs.webkit.org/show_bug.cgi?id=48935
+
+        Marked resources loaded from memory cache as finished.
+
+        * inspector/front-end/ResourceManager.js:
+        (WebInspector.ResourceManager.prototype.didLoadResourceFromMemoryCache):
+
+2010-11-06  Pavel Feldman  <pfeldman at chromium.org>
+
         Reviewed by Timothy Hatcher.
 
         Web Inspector: XHR logging is not checked in context menu after browser restart.
diff --git a/WebCore/inspector/front-end/ResourceManager.js b/WebCore/inspector/front-end/ResourceManager.js
index 5a2e9e1..bb34561 100644
--- a/WebCore/inspector/front-end/ResourceManager.js
+++ b/WebCore/inspector/front-end/ResourceManager.js
@@ -225,7 +225,9 @@ WebInspector.ResourceManager.prototype = {
         var resource = this._createResource(null, cachedResource.url, cachedResource.loader);
         this._updateResourceWithCachedResource(resource, cachedResource);
         resource.cached = true;
+        resource.requestMethod = "GET";
         resource.startTime = resource.responseReceivedTime = resource.endTime = time;
+        resource.finished = true;
 
         WebInspector.panels.network.refreshResource(resource);
         WebInspector.panels.audits.resourceStarted(resource);

-- 
WebKit Debian packaging