Changeset 196301 in webkit


Ignore:
Timestamp:
Feb 8, 2016 7:33:17 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Web Inspector: Uncaught exception merging script profiler records
https://bugs.webkit.org/show_bug.cgi?id=154004

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-02-08
Reviewed by Brian Burg.

  • UserInterface/Controllers/TimelineManager.js:

(WebInspector.TimelineManager.prototype._mergeScriptProfileRecords):
Stop if we've merged all script profiler records.

Location:
trunk/Source/WebInspectorUI
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebInspectorUI/ChangeLog

    r196285 r196301  
     12016-02-08  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: Uncaught exception merging script profiler records
     4        https://bugs.webkit.org/show_bug.cgi?id=154004
     5
     6        Reviewed by Brian Burg.
     7
     8        * UserInterface/Controllers/TimelineManager.js:
     9        (WebInspector.TimelineManager.prototype._mergeScriptProfileRecords):
     10        Stop if we've merged all script profiler records.
     11
    1122016-02-08  Joseph Pecoraro  <pecoraro@apple.com>
    213
  • trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js

    r195999 r196301  
    752752        let profilerRecord = nextScriptProfilerRecord();
    753753
    754         while (webRecord) {
     754        while (webRecord && profilerRecord) {
    755755            // Skip web records with parent web records. For example an EvaluateScript with an EvaluateScript parent.
    756756            if (webRecord.parent instanceof WebInspector.ScriptTimelineRecord) {
Note: See TracChangeset for help on using the changeset viewer.