Changeset 55614 in webkit

Timestamp:

Mar 6, 2010 3:00:35 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-03-06 Ilya Tikhonovsky <​loislo@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):

Location:

trunk

Files:

• LayoutTests/inspector/timeline-network-resource-expected.txt (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/English.lproj/localizedStrings.js (modified) (previous)
• WebCore/inspector/front-end/Popover.js (modified) (3 diffs)
• WebCore/inspector/front-end/TimelinePanel.js (modified) (5 diffs)

trunk/LayoutTests/inspector/timeline-network-resource-expected.txt

@@ -19 +19 @@
 +- mimeType : application/x-javascript
 +- expectedContentLength : 210
++- url : * DEFINED *
 + }
 + type : 13
@@ -27 +28 @@
 +- identifier : * DEFINED *
 +- didFail : false
++- url : * DEFINED *
 + }
 + type : 14

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-06  Ilya Tikhonovsky  <loislo@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@chromium.org>
 

trunk/WebCore/inspector/front-end/Popover.js

@@ -161 +161 @@
     _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);
     },
 
@@ -177 +171 @@
             return;
 
-        this._resetHoverTimer();
         // User has 500ms to reach the popup.
-        if (this._popup) {
+        if (this._popup && !this._hidePopupTimer) {
             var self = this;
             function doHide()
@@ -189 +182 @@
         }
 
+        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);
     },

trunk/WebCore/inspector/front-end/TimelinePanel.js

@@ -625 +625 @@
         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);
@@ -633 +634 @@
         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;
@@ -696 +698 @@
         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) {
@@ -709 +712 @@
                     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));
@@ -740 +746 @@
             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;