[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
pfeldman at chromium.org
pfeldman at chromium.org
Wed Apr 7 23:22:37 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit b009b09d565ae295dda8f797c77e5dc6308fd774
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 4 19:32:05 2009 +0000
2009-11-04 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: Add basic support for resource events and marks.
Couple of drive-by fixes. Enabling the panel!
https://bugs.webkit.org/show_bug.cgi?id=31130
* English.lproj/localizedStrings.js:
* inspector/front-end/TimelinePanel.js:
(WebInspector.TimelinePanel):
(WebInspector.TimelinePanel.prototype._formatRecord):
(WebInspector.TimelinePanel.prototype._getRecordDetails):
(WebInspector.TimelinePanel.prototype.reset):
(WebInspector.TimelineCategoryTreeElement.prototype._onCheckboxClicked):
(WebInspector.TimelineRecordTreeElement.prototype.onattach):
* inspector/front-end/inspector.js:
(WebInspector._createPanels):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50520 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d7ffa7..bff1e45 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2009-11-04 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: Add basic support for resource events and marks.
+ Couple of drive-by fixes. Enabling the panel!
+
+ https://bugs.webkit.org/show_bug.cgi?id=31130
+
+ * English.lproj/localizedStrings.js:
+ * inspector/front-end/TimelinePanel.js:
+ (WebInspector.TimelinePanel):
+ (WebInspector.TimelinePanel.prototype._formatRecord):
+ (WebInspector.TimelinePanel.prototype._getRecordDetails):
+ (WebInspector.TimelinePanel.prototype.reset):
+ (WebInspector.TimelineCategoryTreeElement.prototype._onCheckboxClicked):
+ (WebInspector.TimelineRecordTreeElement.prototype.onattach):
+ * inspector/front-end/inspector.js:
+ (WebInspector._createPanels):
+
2009-11-03 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index c221802..c1b00b4 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index 79fa0e9..5b0d8c6 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -45,6 +45,7 @@ WebInspector.TimelinePanel = function()
this.calculator = new WebInspector.TimelineCalculator();
for (category in this.categories)
this.showCategory(category);
+ this._resourceURLs = {};
}
WebInspector.TimelinePanel.prototype = {
@@ -139,9 +140,9 @@ WebInspector.TimelinePanel.prototype = {
_formatRecord: function(record)
{
+ var recordTypes = WebInspector.TimelineAgent.RecordType;
if (!this._recordStyles) {
this._recordStyles = {};
- var recordTypes = WebInspector.TimelineAgent.RecordType;
this._recordStyles[recordTypes.EventDispatch] = { title: WebInspector.UIString("Event"), category: this.categories.scripting };
this._recordStyles[recordTypes.Layout] = { title: WebInspector.UIString("Layout"), category: this.categories.rendering };
this._recordStyles[recordTypes.RecalculateStyles] = { title: WebInspector.UIString("Recalculate Style"), category: this.categories.rendering };
@@ -153,6 +154,10 @@ WebInspector.TimelinePanel.prototype = {
this._recordStyles[recordTypes.XHRReadyStateChange] = { title: WebInspector.UIString("XHR Ready State Change"), category: this.categories.scripting };
this._recordStyles[recordTypes.XHRLoad] = { title: WebInspector.UIString("XHR Load"), category: this.categories.scripting };
this._recordStyles[recordTypes.EvaluateScript] = { title: WebInspector.UIString("Evaluate Script"), category: this.categories.scripting };
+ this._recordStyles[recordTypes.MarkTimeline] = { title: WebInspector.UIString("Mark"), category: this.categories.scripting };
+ this._recordStyles[recordTypes.ResourceSendRequest] = { title: WebInspector.UIString("Send Request"), category: this.categories.loading };
+ this._recordStyles[recordTypes.ResourceReceiveResponse] = { title: WebInspector.UIString("Receive Response"), category: this.categories.loading };
+ this._recordStyles[recordTypes.ResourceFinish] = { title: WebInspector.UIString("Finish Loading"), category: this.categories.loading };
}
var style = this._recordStyles[record.type];
@@ -176,6 +181,8 @@ WebInspector.TimelinePanel.prototype = {
switch (record.type) {
case WebInspector.TimelineAgent.RecordType.EventDispatch:
return record.data ? record.data.type : "";
+ case WebInspector.TimelineAgent.RecordType.Paint:
+ return record.data.width + " x " + record.data.height;
case WebInspector.TimelineAgent.RecordType.TimerInstall:
case WebInspector.TimelineAgent.RecordType.TimerRemove:
case WebInspector.TimelineAgent.RecordType.TimerFire:
@@ -183,7 +190,14 @@ WebInspector.TimelinePanel.prototype = {
case WebInspector.TimelineAgent.RecordType.XHRReadyStateChange:
case WebInspector.TimelineAgent.RecordType.XHRLoad:
case WebInspector.TimelineAgent.RecordType.EvaluateScript:
- return record.data.url;
+ case WebInspector.TimelineAgent.RecordType.ResourceSendRequest:
+ this._resourceURLs[record.data.identifier] = record.data.url;
+ return WebInspector.displayNameForURL(record.data.url);
+ case WebInspector.TimelineAgent.RecordType.ResourceReceiveResponse:
+ case WebInspector.TimelineAgent.RecordType.ResourceFinish:
+ return WebInspector.displayNameForURL(this._resourceURLs[record.data.identifier]);
+ case WebInspector.TimelineAgent.RecordType.MarkTimeline:
+ return record.data.message;
default:
return "";
}
@@ -197,6 +211,7 @@ WebInspector.TimelinePanel.prototype = {
for (var category in this.categories)
this._categoryGraphs[category].clearChunks();
this._setWindowPosition(0, this._overviewGridElement.clientWidth);
+ this._resourceURLs = {};
},
_createOverview: function()
@@ -455,8 +470,10 @@ WebInspector.TimelineCategoryTreeElement.prototype = {
_onCheckboxClicked: function (event) {
if (event.target.checked)
WebInspector.panels.timeline.showCategory(this._category.name);
- else
+ else {
WebInspector.panels.timeline.hideCategory(this._category.name);
+ WebInspector.panels.timeline.adjustScrollPosition();
+ }
WebInspector.panels.timeline._categoryGraphs[this._category.name].dimmed = !event.target.checked;
}
}
@@ -496,6 +513,7 @@ WebInspector.TimelineRecordTreeElement.prototype = {
var dataElement = document.createElement("span");
dataElement.className = "data";
dataElement.textContent = "(" + this._record.details + ")";
+ dataElement.title = this._record.details;
dataElement.addStyleClass("dimmed");
this.listItemElement.appendChild(separatorElement);
this.listItemElement.appendChild(dataElement);
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index b9852fe..4bf96ca 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -139,13 +139,12 @@ var WebInspector = {
this.panels.resources = new WebInspector.ResourcesPanel();
if (hiddenPanels.indexOf("scripts") === -1)
this.panels.scripts = new WebInspector.ScriptsPanel();
+ if (hiddenPanels.indexOf("timeline") === -1)
+ this.panels.timeline = new WebInspector.TimelinePanel();
if (hiddenPanels.indexOf("profiles") === -1) {
this.panels.profiles = new WebInspector.ProfilesPanel();
this.panels.profiles.registerProfileType(new WebInspector.CPUProfileType());
}
- // FIXME: Uncomment when ready.
- // if (hiddenPanels.indexOf("timeline") === -1 && hiddenPanels.indexOf("timeline") === -1)
- // this.panels.timeline = new WebInspector.TimelinePanel();
if (hiddenPanels.indexOf("storage") === -1 && hiddenPanels.indexOf("databases") === -1)
this.panels.storage = new WebInspector.StoragePanel();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list