[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 6c0857b2352b42cdd12144d6a93c2f1ace399cab
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 16:58:16 2010 +0000

    2010-01-18  Mikhail Naganov  <mnaganov at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Don't show Profiles welcome screen on panel switch,
            if a profile view is shown.
    
            https://bugs.webkit.org/show_bug.cgi?id=33799
    
            * inspector/front-end/ProfilesPanel.js:
            (WebInspector.ProfilesPanel.prototype.show):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53409 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9cb71a6..6c10ce0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-18  Mikhail Naganov  <mnaganov at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Don't show Profiles welcome screen on panel switch,
+        if a profile view is shown.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33799
+
+        * inspector/front-end/ProfilesPanel.js:
+        (WebInspector.ProfilesPanel.prototype.show):
+
 2010-01-18  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/inspector/front-end/ProfilesPanel.js b/WebCore/inspector/front-end/ProfilesPanel.js
index bd839f8..6cbee84 100644
--- a/WebCore/inspector/front-end/ProfilesPanel.js
+++ b/WebCore/inspector/front-end/ProfilesPanel.js
@@ -157,7 +157,8 @@ WebInspector.ProfilesPanel.prototype = {
     show: function()
     {
         WebInspector.Panel.prototype.show.call(this);
-        this.welcomeView.show();
+        if (!this.visibleView)
+            this.welcomeView.show();
         if (this._shouldPopulateProfiles)
             this._populateProfiles();
     },

-- 
WebKit Debian packaging