[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
eric at webkit.org
eric at webkit.org
Wed Jan 20 22:27:54 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit fd53913104d2e5a27c98271beb9edd15998a9de8
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
More information about the Pkg-webkit-commits
mailing list