Changeset 147097 in webkit
- Timestamp:
- Mar 28, 2013 5:16:03 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r147095 r147097 1 2013-03-25 Andrey Kosyakov <caseq@chromium.org> 2 3 Web Inspector: DOMContentLoaded event divider is not shown on Timeline's main view 4 https://bugs.webkit.org/show_bug.cgi?id=113196 5 6 Reviewed by Pavel Feldman. 7 8 - use TimelinePresentationModel to fetch list of event divider records; 9 10 * http/tests/inspector/timeline-test.js: 11 (initialize_Timeline.InspectorTest.printTimestampRecords): 12 * inspector/timeline/timeline-load-event-expected.txt: 13 * inspector/timeline/timeline-load-event.html: 14 1 15 2013-03-28 Andrey Lushnikov <lushnikov@chromium.org> 2 16 -
trunk/LayoutTests/http/tests/inspector/timeline-test.js
r146476 r147097 113 113 InspectorTest.printTimestampRecords = function(typeName, formatter) 114 114 { 115 InspectorTest.innerPrintTimelineRecords(WebInspector.panels.timeline._ timeStampRecords.select("_record"), typeName, formatter);115 InspectorTest.innerPrintTimelineRecords(WebInspector.panels.timeline._presentationModel.eventDividerRecords().select("_record"), typeName, formatter); 116 116 }; 117 117 -
trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt
r144439 r147097 2 2 3 3 Page reloaded. 4 Model records: 5 MarkDOMContent Properties: 6 { 7 counters : <object> 8 data : { 9 isMainFrame : true 10 } 11 frameId : <string> 12 startTime : <number> 13 type : "MarkDOMContent" 14 usedHeapSize : <number> 15 } 16 MarkLoad Properties: 17 { 18 counters : <object> 19 data : { 20 isMainFrame : true 21 } 22 frameId : <string> 23 startTime : <number> 24 type : "MarkLoad" 25 usedHeapSize : <number> 26 } 27 Timestamp records: 28 MarkDOMContent Properties: 29 { 30 counters : <object> 31 data : { 32 isMainFrame : true 33 } 34 frameId : <string> 35 startTime : <number> 36 type : "MarkDOMContent" 37 usedHeapSize : <number> 38 } 4 39 MarkLoad Properties: 5 40 { -
trunk/LayoutTests/inspector/timeline/timeline-load-event.html
r143573 r147097 20 20 function finish() 21 21 { 22 if (++finishCalled === 2) { 23 InspectorTest.printTimelineRecords("MarkLoad"); 24 InspectorTest.completeTest(); 25 } 22 if (++finishCalled !== 2) 23 return; 24 25 InspectorTest.addResult("Model records:"); 26 InspectorTest.printTimelineRecords("MarkDOMContent"); 27 InspectorTest.printTimelineRecords("MarkLoad"); 28 InspectorTest.addResult("Timestamp records:"); 29 InspectorTest.printTimestampRecords("MarkDOMContent"); 30 InspectorTest.printTimestampRecords("MarkLoad"); 31 InspectorTest.completeTest(); 26 32 } 27 33 } -
trunk/Source/WebCore/ChangeLog
r147096 r147097 1 2013-03-25 Andrey Kosyakov <caseq@chromium.org> 2 3 Web Inspector: DOMContentLoaded event divider is not shown on Timeline's main view 4 https://bugs.webkit.org/show_bug.cgi?id=113196 5 6 Reviewed by Pavel Feldman. 7 8 - keep event divider records in TimelinePresentationModel, not in TimelinePanel; 9 - process event divider records on every level, not just on top. 10 11 * inspector/front-end/TimelinePanel.js: 12 (WebInspector.TimelinePanel.prototype._updateEventDividers): 13 (WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline.checkVisible): 14 (WebInspector.TimelinePanel.prototype._resetPanel): 15 * inspector/front-end/TimelinePresentationModel.js: 16 (WebInspector.TimelinePresentationModel.prototype.reset): 17 (WebInspector.TimelinePresentationModel.prototype._innerAddRecord): 18 (WebInspector.TimelinePresentationModel.prototype.eventDividerRecords): 19 1 20 2013-03-28 Vsevolod Vlasov <vsevik@chromium.org> 2 21 -
trunk/Source/WebCore/inspector/front-end/TimelinePanel.js
r147076 r147097 135 135 this._durationFilter = new WebInspector.TimelineIsLongFilter(); 136 136 137 this._timeStampRecords = [];138 137 this._expandOffset = 15; 139 138 … … 472 471 var clientWidth = this._graphRowsElementWidth; 473 472 var dividers = []; 474 475 for (var i = 0; i < this._timeStampRecords.length; ++i) { 476 var record = this._timeStampRecords[i]; 473 var eventDividerRecords = this._presentationModel.eventDividerRecords(); 474 475 for (var i = 0; i < eventDividerRecords.length; ++i) { 476 var record = eventDividerRecords[i]; 477 477 var positions = this._calculator.computeBarGraphWindowPosition(record); 478 478 var dividerPosition = Math.round(positions.left); … … 649 649 var records = this._presentationModel.addRecord(record); 650 650 this._allRecordsCount += records.length; 651 var timeStampRecords = this._timeStampRecords;652 651 var hasVisibleRecords = false; 653 652 var presentationModel = this._presentationModel; 654 function processRecord(record)653 function checkVisible(record) 655 654 { 656 if (WebInspector.TimelinePresentationModel.isEventDivider(record))657 timeStampRecords.push(record);658 655 hasVisibleRecords |= presentationModel.isVisible(record); 659 656 } 660 WebInspector.TimelinePresentationModel.forAllRecords(records, processRecord);657 WebInspector.TimelinePresentationModel.forAllRecords(records, checkVisible); 661 658 662 659 function isAdoptedRecord(record) … … 712 709 { 713 710 this._presentationModel.reset(); 714 this._timeStampRecords = [];715 711 this._boundariesAreValid = false; 716 712 this._adjustScrollPosition(0); … … 1211 1207 }, 1212 1208 1213 _updateSearchResults: function() { 1209 _updateSearchResults: function() 1210 { 1214 1211 var searchRegExp = this._searchRegExp; 1215 1212 if (!searchRegExp) -
trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js
r145727 r147097 266 266 this._timerRecords = {}; 267 267 this._requestAnimationFrameRecords = {}; 268 this._eventDividerRecords = []; 268 269 this._timeRecords = {}; 269 270 this._timeRecordStack = []; … … 346 347 var formattedRecord = new WebInspector.TimelinePresentationModel.Record(this, record, parentRecord, origin, scriptDetails, isHiddenRecord); 347 348 349 if (WebInspector.TimelinePresentationModel.isEventDivider(formattedRecord)) 350 this._eventDividerRecords.push(formattedRecord); 351 348 352 if (isHiddenRecord) 349 353 return formattedRecord; … … 537 541 ++lastFrame; 538 542 return this._frames.slice(firstFrame, lastFrame); 543 }, 544 545 eventDividerRecords: function() 546 { 547 return this._eventDividerRecords; 539 548 }, 540 549
Note: See TracChangeset
for help on using the changeset viewer.