[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 03305a55a46981a852527353f1f5ef5e52b653d2
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 17 20:59:43 2011 +0000

    2011-01-17  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: follow-up fix for r52574: do not reuse clear() for navigation.
    
            * inspector/front-end/NetworkPanel.js:
            (WebInspector.NetworkPanel.prototype.clear):
            (WebInspector.NetworkPanel.prototype.mainResourceChanged):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75969 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8508257..35c0beb 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-17  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: follow-up fix for r52574: do not reuse clear() for navigation.
+
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkPanel.prototype.clear):
+        (WebInspector.NetworkPanel.prototype.mainResourceChanged):
+
 2011-01-17  Sergio Villar Senin  <svillar at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/Source/WebCore/inspector/front-end/NetworkPanel.js b/Source/WebCore/inspector/front-end/NetworkPanel.js
index 204cc22..28cbd36 100644
--- a/Source/WebCore/inspector/front-end/NetworkPanel.js
+++ b/Source/WebCore/inspector/front-end/NetworkPanel.js
@@ -808,13 +808,15 @@ WebInspector.NetworkPanel.prototype = {
     {
         if (this._preserveLogToggle.toggled)
             return;
-
         this._reset();
     },
 
     mainResourceChanged: function()
     {
-        this.clear();
+        if (this._preserveLogToggle.toggled)
+            return;
+
+        this._reset();
         // Now resurrect the main resource along with all redirects that lead to it.
         var resourcesToAppend = (WebInspector.mainResource.redirects || []).concat(WebInspector.mainResource);
         resourcesToAppend.forEach(this.appendResource, this);

-- 
WebKit Debian packaging