[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6d001fbc0a93fb7effc6b136123f1b59d9eeadcb
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 20 15:40:03 2010 +0000

    2010-02-20  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: re-creating view in ResourcesPanel confuses ScriptsPanel's visibleView logic.
    
            https://bugs.webkit.org/show_bug.cgi?id=35192
    
            * inspector/front-end/ResourcesPanel.js:
            (WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded):
            * inspector/front-end/ScriptsPanel.js:
            (WebInspector.ScriptsPanel.prototype.show):
            (WebInspector.ScriptsPanel.prototype.viewRecreated):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55052 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c2b790e..6c836a8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Timothy Hatcher.
 
+        Web Inspector: re-creating view in ResourcesPanel confuses ScriptsPanel's visibleView logic.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35192
+
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype.show):
+        (WebInspector.ScriptsPanel.prototype.viewRecreated):
+
+2010-02-20  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
         Web Inspector: need to highlight the evaluated expression used for popovers.
 
         https://bugs.webkit.org/show_bug.cgi?id=35126
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index 19325bb..9a44c57 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -450,6 +450,8 @@ WebInspector.ResourcesPanel.prototype = {
 
         if (oldViewParentNode)
             newView.show(oldViewParentNode);
+
+        WebInspector.panels.scripts.viewRecreated(oldView, newView);
     },
 
     canShowSourceLineForURL: function(url)
diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index da24ed2..ed1ad6e 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -508,6 +508,12 @@ WebInspector.ScriptsPanel.prototype = {
             x.show(this.viewsContainerElement);
     },
 
+    viewRecreated: function(oldView, newView)
+    {
+        if (this._visibleView === oldView)
+            this._visibleView = newView;
+    },
+
     canShowSourceLineForURL: function(url)
     {
         return InspectorBackend.debuggerEnabled() &&

-- 
WebKit Debian packaging