[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 679dcdcc0ddcafaa2c5dccd39ac44121a93a8632
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 18:12:18 2010 +0000

    2010-11-02  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: clear / hide timing information for cached resources.
            https://bugs.webkit.org/show_bug.cgi?id=48848
    
            * inspector/front-end/Resource.js:
            (WebInspector.Resource.prototype.set cached):
            (WebInspector.Resource.prototype.get timing):
            (WebInspector.Resource.prototype.set timing):
            * inspector/front-end/ResourceManager.js:
            (WebInspector.ResourceManager.prototype.markResourceAsCached):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71136 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6467b71..803f9f3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Timothy Hatcher.
 
+        Web Inspector: clear / hide timing information for cached resources.
+        https://bugs.webkit.org/show_bug.cgi?id=48848
+
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype.set cached):
+        (WebInspector.Resource.prototype.get timing):
+        (WebInspector.Resource.prototype.set timing):
+        * inspector/front-end/ResourceManager.js:
+        (WebInspector.ResourceManager.prototype.markResourceAsCached):
+
+2010-11-02  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
         Web Inspector: improve network's 'preview close' usability.
         https://bugs.webkit.org/show_bug.cgi?id=48846
 
diff --git a/WebCore/inspector/front-end/Resource.js b/WebCore/inspector/front-end/Resource.js
index e310d46..72f867f 100644
--- a/WebCore/inspector/front-end/Resource.js
+++ b/WebCore/inspector/front-end/Resource.js
@@ -287,6 +287,20 @@ WebInspector.Resource.prototype = {
     set cached(x)
     {
         this._cached = x;
+        if (x)
+            delete this._timing;
+    },
+
+
+    get timing()
+    {
+        return this._timing;
+    },
+
+    set timing(x)
+    {
+        if (!this._cached)
+            this._timing = x;
     },
 
     get mimeType()
diff --git a/WebCore/inspector/front-end/ResourceManager.js b/WebCore/inspector/front-end/ResourceManager.js
index 33b79fc..6580be5 100644
--- a/WebCore/inspector/front-end/ResourceManager.js
+++ b/WebCore/inspector/front-end/ResourceManager.js
@@ -137,7 +137,6 @@ WebInspector.ResourceManager.prototype = {
             return;
 
         resource.cached = true;
-        delete resource.timing;
         WebInspector.panels.network.refreshResource(resource);
     },
 

-- 
WebKit Debian packaging