[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
eric at webkit.org
eric at webkit.org
Thu Feb 4 21:31:01 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 627a3c52210536e497b770cf9494ecb7eb4292ea
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 28 12:34:02 2010 +0000
2010-01-28 Mikhail Naganov <mnaganov at chromium.org>
Reviewed by Timothy Hatcher.
Simplify views logic in Profiler panel, and fix the problem described in the issue.
Remove image from Welcome view.
Preserve border on status bar-like buttons in Welcome view on window deactivation.
https://bugs.webkit.org/show_bug.cgi?id=34201
* inspector/front-end/ProfilesPanel.js:
(WebInspector.ProfilesPanel.prototype.show):
(WebInspector.ProfilesPanel.prototype.reset):
(WebInspector.ProfilesPanel.prototype.addProfileHeader):
(WebInspector.ProfilesPanel.prototype.showView):
(WebInspector.ProfilesPanel.prototype._updateInterface):
* inspector/front-end/WelcomeView.js:
(WebInspector.WelcomeView):
* inspector/front-end/inspector.css:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53996 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b82c0b7..88db4a1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-01-28 Mikhail Naganov <mnaganov at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Simplify views logic in Profiler panel, and fix the problem described in the issue.
+ Remove image from Welcome view.
+ Preserve border on status bar-like buttons in Welcome view on window deactivation.
+
+ https://bugs.webkit.org/show_bug.cgi?id=34201
+
+ * inspector/front-end/ProfilesPanel.js:
+ (WebInspector.ProfilesPanel.prototype.show):
+ (WebInspector.ProfilesPanel.prototype.reset):
+ (WebInspector.ProfilesPanel.prototype.addProfileHeader):
+ (WebInspector.ProfilesPanel.prototype.showView):
+ (WebInspector.ProfilesPanel.prototype._updateInterface):
+ * inspector/front-end/WelcomeView.js:
+ (WebInspector.WelcomeView):
+ * inspector/front-end/inspector.css:
+
2010-01-18 Holger Hans Peter Freyther <zecke at selfish.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/inspector/front-end/ProfilesPanel.js b/WebCore/inspector/front-end/ProfilesPanel.js
index 4950f14..dd049a1 100644
--- a/WebCore/inspector/front-end/ProfilesPanel.js
+++ b/WebCore/inspector/front-end/ProfilesPanel.js
@@ -157,12 +157,6 @@ WebInspector.ProfilesPanel.prototype = {
show: function()
{
WebInspector.Panel.prototype.show.call(this);
- this._updateInterface();
- if (!this.visibleView) {
- this.visibleView = this.welcomeView;
- this.welcomeView.show();
- }
- this.visibleView.show();
if (this._shouldPopulateProfiles)
this._populateProfiles();
},
@@ -190,6 +184,7 @@ WebInspector.ProfilesPanel.prototype = {
{
for (var i = 0; i < this._profiles.length; ++i)
delete this._profiles[i]._profileView;
+ delete this.visibleView;
delete this.currentQuery;
this.searchCanceled();
@@ -209,6 +204,7 @@ WebInspector.ProfilesPanel.prototype = {
this.profileViewStatusBarItemsContainer.removeChildren();
this._updateInterface();
+ this.welcomeView.show();
},
registerProfileType: function(profileType)
@@ -307,7 +303,8 @@ WebInspector.ProfilesPanel.prototype = {
profile._profilesTreeElement = profileTreeElement;
sidebarParent.appendChild(profileTreeElement);
- if (!this.visibleView || this.visibleView === this.welcomeView)
+ this.welcomeView.hide();
+ if (!this.visibleView)
this.showProfile(profile);
},
@@ -336,19 +333,7 @@ WebInspector.ProfilesPanel.prototype = {
showView: function(view)
{
- if (this.visibleView === view) {
- if (this.visibleView && !this.visibleView.visible)
- view.show();
- return;
- }
-
- this._previousVisibleView = this.visibleView;
- if (view === this.welcomeView) {
- this.closeVisibleView();
- this.visibleView = view;
- view.show();
- } else
- this.showProfile(view.profile);
+ this.showProfile(view.profile);
},
getProfileType: function(typeId)
@@ -451,17 +436,13 @@ WebInspector.ProfilesPanel.prototype = {
this._profileTypeButtonsByIdMap[typeId].removeStyleClass("hidden");
this.profileViewStatusBarItemsContainer.removeStyleClass("hidden");
this.panelEnablerView.visible = false;
- this.welcomeView.visible = true;
- this.visibleView = this._previousVisibleView || this.welcomeView;
} else {
this.enableToggleButton.title = WebInspector.UIString("Profiling disabled. Click to enable.");
this.enableToggleButton.toggled = false;
for (var typeId in this._profileTypeButtonsByIdMap)
this._profileTypeButtonsByIdMap[typeId].addStyleClass("hidden");
this.profileViewStatusBarItemsContainer.addStyleClass("hidden");
- this.welcomeView.visible = false;
this.panelEnablerView.visible = true;
- this.visibleView = this.panelEnablerView;
}
},
diff --git a/WebCore/inspector/front-end/WelcomeView.js b/WebCore/inspector/front-end/WelcomeView.js
index 73e6447..0feee12 100644
--- a/WebCore/inspector/front-end/WelcomeView.js
+++ b/WebCore/inspector/front-end/WelcomeView.js
@@ -39,8 +39,9 @@ WebInspector.WelcomeView = function(identifier, headingText, instructionsText)
this.contentElement.className = "panel-enabler-view-content";
this.element.appendChild(this.contentElement);
- this.imageElement = document.createElement("img");
- this.contentElement.appendChild(this.imageElement);
+ this.alignerElement = document.createElement("div");
+ this.alignerElement.className = "welcome-instructions-aligner";
+ this.contentElement.appendChild(this.alignerElement);
this.instructionsElement = document.createElement("div");
this.instructionsElement.className = "instructions";
@@ -55,22 +56,6 @@ WebInspector.WelcomeView = function(identifier, headingText, instructionsText)
}
WebInspector.WelcomeView.prototype = {
-
- show: function(parentElement)
- {
- WebInspector.View.prototype.show.call(this, parentElement);
-
- setTimeout(this.resize.bind(this), 0);
- },
-
- resize: function()
- {
- this.imageElement.removeStyleClass("hidden");
-
- if (this.element.offsetWidth < (this.instructionsElement.offsetWidth + this.imageElement.offsetWidth))
- this.imageElement.addStyleClass("hidden");
- },
-
addMessage: function(message)
{
var messageElement = document.createElement("div");
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index b9a4155..e6c73cc 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -2238,7 +2238,7 @@ body.inactive .data-grid th.sort-ascending, body.inactive .data-grid th.sort-des
display: none;
}
-.panel-enabler-view img {
+.panel-enabler-view img, div.welcome-instructions-aligner {
height: 100%;
min-height: 200px;
max-width: 100%;
@@ -2292,10 +2292,9 @@ body.inactive .data-grid th.sort-ascending, body.inactive .data-grid th.sort-des
z-index: auto;
}
-.panel-enabler-view.welcome img {
- height: 90%;
- min-height: 180px;
- max-width: 90%;
+.panel-enabler-view.welcome div.welcome-instructions-aligner {
+ display: inline-block;
+ width: 0;
}
.panel-enabler-view.welcome .instructions {
@@ -2303,7 +2302,6 @@ body.inactive .data-grid th.sort-ascending, body.inactive .data-grid th.sort-des
vertical-align: middle;
width: 330px;
margin: 0;
- padding: 15px;
white-space: normal;
line-height: 175%;
}
@@ -2321,12 +2319,12 @@ body.inactive .data-grid th.sort-ascending, body.inactive .data-grid th.sort-des
padding: 2px 9px;
}
-.panel-enabler-view button:active, .pane button:active {
+.panel-enabler-view button:active:not(.status-bar-item), .pane button:active {
background-color: rgb(215, 215, 215);
background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(194, 194, 194)), to(rgb(239, 239, 239)));
}
-body.inactive .panel-enabler-view button, .panel-enabler-view button:disabled, body.inactive .pane button, .pane button:disabled {
+body.inactive .panel-enabler-view button:not(.status-bar-item), .panel-enabler-view button:disabled:not(.status-bar-item), body.inactive .pane button, .pane button:disabled {
color: rgb(130, 130, 130);
border-color: rgb(212, 212, 212);
background-color: rgb(239, 239, 239);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list