[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
pfeldman at chromium.org
pfeldman at chromium.org
Thu Apr 8 02:12:20 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 34a972f9a552ab17ce66642156f802622eeb7dc4
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Mar 6 11:00:35 2010 +0000
2010-03-06 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: in Timeline panel, click followed with mouse move resets popover.
https://bugs.webkit.org/show_bug.cgi?id=35827
* inspector/front-end/Popover.js:
(WebInspector.PopoverHelper.prototype._mouseDown):
(WebInspector.PopoverHelper.prototype._mouseMove):
(WebInspector.PopoverHelper.prototype._handleMouseAction):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55614 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/inspector/timeline-network-resource-expected.txt b/LayoutTests/inspector/timeline-network-resource-expected.txt
index 8bce236..a3f73c0 100644
--- a/LayoutTests/inspector/timeline-network-resource-expected.txt
+++ b/LayoutTests/inspector/timeline-network-resource-expected.txt
@@ -18,6 +18,7 @@ ResourceReceiveResponse Properties:
+- statusCode : 0
+- mimeType : application/x-javascript
+- expectedContentLength : 210
++- url : * DEFINED *
+ }
+ type : 13
@@ -26,6 +27,7 @@ ResourceFinish Properties:
+ data : {
+- identifier : * DEFINED *
+- didFail : false
++- url : * DEFINED *
+ }
+ type : 14
Script resource loaded
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8fdbd39..7ce6dfb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-06 Ilya Tikhonovsky <loislo at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: in Timeline panel, click followed with mouse move resets popover.
+
+ https://bugs.webkit.org/show_bug.cgi?id=35827
+
+ * inspector/front-end/Popover.js:
+ (WebInspector.PopoverHelper.prototype._mouseDown):
+ (WebInspector.PopoverHelper.prototype._mouseMove):
+ (WebInspector.PopoverHelper.prototype._handleMouseAction):
+
2010-03-05 Tony Chang <tony at chromium.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index 871cf2a..281d845 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/front-end/Popover.js b/WebCore/inspector/front-end/Popover.js
index 8f574d0..464416d 100644
--- a/WebCore/inspector/front-end/Popover.js
+++ b/WebCore/inspector/front-end/Popover.js
@@ -160,14 +160,8 @@ WebInspector.PopoverHelper = function(panelElement, getAnchor, showPopup, showOn
WebInspector.PopoverHelper.prototype = {
_mouseDown: function(event)
{
- this._resetHoverTimer();
- if (this._showOnClick) {
- var anchor = this._getAnchor(event.target);
- if (anchor) {
- this._popup = this._showPopup(anchor);
- this._killHidePopupTimer();
- }
- }
+ this._killHidePopupTimer();
+ this._handleMouseAction(event, true);
},
_mouseMove: function(event)
@@ -176,9 +170,8 @@ WebInspector.PopoverHelper.prototype = {
if (this._hoverElement === event.target || (this._hoverElement && this._hoverElement.isAncestor(event.target)))
return;
- this._resetHoverTimer();
// User has 500ms to reach the popup.
- if (this._popup) {
+ if (this._popup && !this._hidePopupTimer) {
var self = this;
function doHide()
{
@@ -188,11 +181,18 @@ WebInspector.PopoverHelper.prototype = {
this._hidePopupTimer = setTimeout(doHide, 500);
}
+ this._handleMouseAction(event);
+ },
+
+ _handleMouseAction: function(event, isMouseDown)
+ {
+ this._resetHoverTimer();
+
this._hoverElement = this._getAnchor(event.target);
if (!this._hoverElement)
return;
- const toolTipDelay = this._popup ? 600 : 1000;
+ const toolTipDelay = isMouseDown ? 0 : (this._popup ? 600 : 1000);
this._hoverTimer = setTimeout(this._mouseHover.bind(this, this._hoverElement), toolTipDelay);
},
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index 2c452e5..d9f6615 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -624,6 +624,7 @@ WebInspector.TimelinePanel.FormattedRecord = function(record, recordStyles, send
var sendRequestRecord = sendRequestRecords[record.data.identifier];
if (sendRequestRecord) { // False if we started instrumentation in the middle of request.
sendRequestRecord._responseReceivedFormattedTime = this.startTime;
+ record.data.url = sendRequestRecord.data.url;
this.startTime = sendRequestRecord.startTime;
this.details = this._getRecordDetails(sendRequestRecord, sendRequestRecords);
this.callerScriptName = sendRequestRecord.callerScriptName;
@@ -632,6 +633,7 @@ WebInspector.TimelinePanel.FormattedRecord = function(record, recordStyles, send
} else if (record.type === recordTypes.ResourceFinish) {
var sendRequestRecord = sendRequestRecords[record.data.identifier];
if (sendRequestRecord) {// False for main resource.
+ record.data.url = sendRequestRecord.data.url;
this.startTime = sendRequestRecord._responseReceivedFormattedTime;
this.callerScriptName = sendRequestRecord.callerScriptName;
this.callerScriptLine = sendRequestRecord.callerScriptLine;
@@ -695,10 +697,11 @@ WebInspector.TimelinePanel.FormattedRecord.prototype = {
calculator.formatValue(this.startTime - calculator.minimumBoundary) + ")";
recordContentTable.appendChild(this._createRow(WebInspector.UIString("Duration"), text));
+ const recordTypes = WebInspector.TimelineAgent.RecordType;
if (this.details) {
- if ( this.type == WebInspector.TimelineAgent.RecordType.TimerInstall ||
- this.type == WebInspector.TimelineAgent.RecordType.TimerFire ||
- this.type == WebInspector.TimelineAgent.RecordType.TimerRemove) {
+ if (this.type == recordTypes.TimerInstall ||
+ this.type == recordTypes.TimerFire ||
+ this.type == recordTypes.TimerRemove) {
recordContentTable.appendChild(this._createRow(WebInspector.UIString("Timer Id"), this.data.timerId));
if (this.timeout) {
recordContentTable.appendChild(this._createRow(WebInspector.UIString("Timeout"), this.timeout));
@@ -708,9 +711,12 @@ WebInspector.TimelinePanel.FormattedRecord.prototype = {
var link = WebInspector.linkifyResourceAsNode(this.callSiteScriptName, "scripts", this.callSiteScriptLine, "timeline-details");
recordContentTable.appendChild(this._createLinkRow(WebInspector.UIString("Call Site"), link));
}
- } else if ( this.type == WebInspector.TimelineAgent.RecordType.FunctionCall ) {
+ } else if (this.type == recordTypes.FunctionCall) {
var link = WebInspector.linkifyResourceAsNode(this.data.scriptName, "scripts", this.data.scriptLine, "timeline-details");
recordContentTable.appendChild(this._createLinkRow(WebInspector.UIString("Location"), link));
+ } else if (this.type === recordTypes.ResourceSendRequest || this.type === recordTypes.ResourceReceiveResponse || this.type === recordTypes.ResourceFinish) {
+ var link = WebInspector.linkifyResourceAsNode(this.data.url, "resources", null, "timeline-details");
+ recordContentTable.appendChild(this._createLinkRow(WebInspector.UIString("Resource"), link));
} else
recordContentTable.appendChild(this._createRow(WebInspector.UIString("Details"), this.details));
}
@@ -739,11 +745,9 @@ WebInspector.TimelinePanel.FormattedRecord.prototype = {
case WebInspector.TimelineAgent.RecordType.XHRLoad:
case WebInspector.TimelineAgent.RecordType.EvaluateScript:
case WebInspector.TimelineAgent.RecordType.ResourceSendRequest:
- return WebInspector.displayNameForURL(record.data.url);
case WebInspector.TimelineAgent.RecordType.ResourceReceiveResponse:
case WebInspector.TimelineAgent.RecordType.ResourceFinish:
- var sendRequestRecord = sendRequestRecords[record.data.identifier];
- return sendRequestRecord ? WebInspector.displayNameForURL(sendRequestRecord.data.url) : "";
+ return WebInspector.displayNameForURL(record.data.url);
case WebInspector.TimelineAgent.RecordType.MarkTimeline:
return record.data.message;
default:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list