Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(511)

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js

Issue 2470593002: [Devtools] New network canvas timeline now properly shows initiators (Closed)
Patch Set: changes Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @constructor 6 * @constructor
7 * @param {!WebInspector.NetworkLogView} networkLogView 7 * @param {!WebInspector.NetworkLogView} networkLogView
8 * @param {!WebInspector.NetworkTransferTimeCalculator} timeCalculator 8 * @param {!WebInspector.NetworkTransferTimeCalculator} timeCalculator
9 * @param {!WebInspector.NetworkTransferDurationCalculator} durationCalculator 9 * @param {!WebInspector.NetworkTransferDurationCalculator} durationCalculator
10 * @param {!WebInspector.Setting} networkLogLargeRowsSetting 10 * @param {!WebInspector.Setting} networkLogLargeRowsSetting
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 } 457 }
458 }, 458 },
459 459
460 _setupTimeline: function() 460 _setupTimeline: function()
461 { 461 {
462 this._timelineColumn = new WebInspector.NetworkTimelineColumn(this._netw orkLogView.rowHeight(), this._networkLogView.calculator()); 462 this._timelineColumn = new WebInspector.NetworkTimelineColumn(this._netw orkLogView.rowHeight(), this._networkLogView.calculator());
463 463
464 this._timelineColumn.element.addEventListener("mousewheel", this._onMous eWheel.bind(this, false), { passive: true }); 464 this._timelineColumn.element.addEventListener("mousewheel", this._onMous eWheel.bind(this, false), { passive: true });
465 this._dataGridScroller.addEventListener("mousewheel",this._onMouseWheel. bind(this, true), true); 465 this._dataGridScroller.addEventListener("mousewheel",this._onMouseWheel. bind(this, true), true);
466 466
467 this._timelineColumn.element.addEventListener("mousemove", event => this ._networkLogView.setHoveredRequest(this._timelineColumn.getRequestFromPoint(even t.offsetX, event.offsetY + event.target.offsetTop)), true); 467 this._timelineColumn.element.addEventListener("mousemove", event => this ._networkLogView.setHoveredRequest(this._timelineColumn.getRequestFromPoint(even t.offsetX, event.offsetY + event.target.offsetTop), event.shiftKey), true);
468 this._timelineColumn.element.addEventListener("mouseleave", this._networ kLogView.setHoveredRequest.bind(this._networkLogView, null), true); 468 this._timelineColumn.element.addEventListener("mouseleave", this._networ kLogView.setHoveredRequest.bind(this._networkLogView, null, false), true);
469 469
470 this._timelineScroller = this._timelineColumn.contentElement.createChild ("div", "network-timeline-v-scroll"); 470 this._timelineScroller = this._timelineColumn.contentElement.createChild ("div", "network-timeline-v-scroll");
471 this._timelineScroller.addEventListener("scroll", this._syncScrollers.bi nd(this), { passive: true }); 471 this._timelineScroller.addEventListener("scroll", this._syncScrollers.bi nd(this), { passive: true });
472 this._timelineScrollerContent = this._timelineScroller.createChild("div" , "network-timeline-v-scroll-content"); 472 this._timelineScrollerContent = this._timelineScroller.createChild("div" , "network-timeline-v-scroll-content");
473 473
474 this._dataGrid.addEventListener(WebInspector.DataGrid.Events.PaddingChan ged, () => { 474 this._dataGrid.addEventListener(WebInspector.DataGrid.Events.PaddingChan ged, () => {
475 this._timelineScrollerWidthIsStale = true; 475 this._timelineScrollerWidthIsStale = true;
476 this._syncScrollers(); 476 this._syncScrollers();
477 }); 477 });
478 this._dataGrid.addEventListener(WebInspector.ViewportDataGrid.Events.Vie wportCalculated, this._redrawTimelineColumn.bind(this)); 478 this._dataGrid.addEventListener(WebInspector.ViewportDataGrid.Events.Vie wportCalculated, this._redrawTimelineColumn.bind(this));
(...skipping 10 matching lines...) Expand all
489 /** 489 /**
490 * @param {boolean} shouldConsume 490 * @param {boolean} shouldConsume
491 * @param {!Event} event 491 * @param {!Event} event
492 */ 492 */
493 _onMouseWheel: function(shouldConsume, event) 493 _onMouseWheel: function(shouldConsume, event)
494 { 494 {
495 if (shouldConsume) 495 if (shouldConsume)
496 event.consume(true); 496 event.consume(true);
497 this._activeScroller.scrollTop -= event.wheelDeltaY; 497 this._activeScroller.scrollTop -= event.wheelDeltaY;
498 this._syncScrollers(); 498 this._syncScrollers();
499 this._networkLogView.setHoveredRequest(this._timelineColumn.getRequestFr omPoint(event.offsetX, event.offsetY)); 499 this._networkLogView.setHoveredRequest(this._timelineColumn.getRequestFr omPoint(event.offsetX, event.offsetY), event.shiftKey);
500 }, 500 },
501 501
502 _syncScrollers: function() 502 _syncScrollers: function()
503 { 503 {
504 if (!this._timelineColumn.isShowing()) 504 if (!this._timelineColumn.isShowing())
505 return; 505 return;
506 this._timelineScrollerContent.style.height = this._dataGridScroller.scro llHeight + "px"; 506 this._timelineScrollerContent.style.height = this._dataGridScroller.scro llHeight + "px";
507 this._updateScrollerWidthIfNeeded(); 507 this._updateScrollerWidthIfNeeded();
508 this._dataGridScroller.scrollTop = this._timelineScroller.scrollTop; 508 this._dataGridScroller.scrollTop = this._timelineScroller.scrollTop;
509 }, 509 },
(...skipping 21 matching lines...) Expand all
531 while (currentNode = currentNode.traverseNextNode(true)) { 531 while (currentNode = currentNode.traverseNextNode(true)) {
532 if (currentNode.isNavigationRequest()) 532 if (currentNode.isNavigationRequest())
533 requestData.navigationRequest = currentNode.request(); 533 requestData.navigationRequest = currentNode.request();
534 requestData.requests.push(currentNode.request()); 534 requestData.requests.push(currentNode.request());
535 } 535 }
536 this._timelineColumn.update(this._activeScroller.scrollTop, this._shownE ventDividers, requestData); 536 this._timelineColumn.update(this._activeScroller.scrollTop, this._shownE ventDividers, requestData);
537 }, 537 },
538 538
539 /** 539 /**
540 * @param {?WebInspector.NetworkRequest} request 540 * @param {?WebInspector.NetworkRequest} request
541 * @param {boolean} highlightInitiatorChain
541 */ 542 */
542 setHoveredRequest: function(request) 543 setHoveredRequest: function(request, highlightInitiatorChain)
543 { 544 {
544 if (Runtime.experiments.isEnabled("canvasNetworkTimeline")) 545 if (Runtime.experiments.isEnabled("canvasNetworkTimeline"))
545 this._timelineColumn.setHoveredRequest(request); 546 this._timelineColumn.setHoveredRequest(request, highlightInitiatorCh ain);
546 }, 547 },
547 548
548 _createTimelineHeader: function() 549 _createTimelineHeader: function()
549 { 550 {
550 this._timelineHeaderElement = this._timelineColumn.contentElement.create Child("div", "network-timeline-header"); 551 this._timelineHeaderElement = this._timelineColumn.contentElement.create Child("div", "network-timeline-header");
551 this._timelineHeaderElement.addEventListener("click", timelineHeaderClic ked.bind(this)); 552 this._timelineHeaderElement.addEventListener("click", timelineHeaderClic ked.bind(this));
552 this._timelineHeaderElement.addEventListener("contextmenu", event => thi s._innerHeaderContextMenu(new WebInspector.ContextMenu(event))); 553 this._timelineHeaderElement.addEventListener("contextmenu", event => thi s._innerHeaderContextMenu(new WebInspector.ContextMenu(event)));
553 var innerElement = this._timelineHeaderElement.createChild("div"); 554 var innerElement = this._timelineHeaderElement.createChild("div");
554 innerElement.textContent = WebInspector.UIString("Timeline"); 555 innerElement.textContent = WebInspector.UIString("Timeline");
555 this._timelineColumnSortIcon = this._timelineHeaderElement.createChild(" div", "sort-order-icon-container").createChild("div", "sort-order-icon"); 556 this._timelineColumnSortIcon = this._timelineHeaderElement.createChild(" div", "sort-order-icon-container").createChild("div", "sort-order-icon");
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 { 1103 {
1103 if (Runtime.experiments.isEnabled("canvasNetworkTimeline")) { 1104 if (Runtime.experiments.isEnabled("canvasNetworkTimeline")) {
1104 this._shownEventDividers.delete(WebInspector.NetworkLogViewColumns._ filmStripDividerColor); 1105 this._shownEventDividers.delete(WebInspector.NetworkLogViewColumns._ filmStripDividerColor);
1105 this._redrawTimelineColumn(); 1106 this._redrawTimelineColumn();
1106 return; 1107 return;
1107 } 1108 }
1108 for (var divider of this._eventDividers) 1109 for (var divider of this._eventDividers)
1109 divider.element.classList.toggle("network-frame-divider-selected", f alse); 1110 divider.element.classList.toggle("network-frame-divider-selected", f alse);
1110 } 1111 }
1111 }; 1112 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698