Changeset 243031 in webkit


Ignore:
Timestamp:
Mar 15, 2019, 8:14:52 PM (7 years ago)
Author:
Joseph Pecoraro
Message:

Web Inspector: HAR Extension for Resource Priority
​https://bugs.webkit.org/show_bug.cgi?id=195693

Reviewed by Devin Rousso.

Source/WebInspectorUI:

  • UserInterface/Controllers/HARBuilder.js:

(WI.HARBuilder.entry):
(WI.HARBuilder.priority):
(WI.HARBuilder.networkPriorityFromHARPriority):
Include priority custom extension.

  • UserInterface/Models/LocalResource.js:

(WI.LocalResource.fromHAREntry):
Import priority.

LayoutTests:

  • http/tests/inspector/network/har/har-basic-expected.txt:
  • http/tests/inspector/network/har/har-page-expected.txt:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r243024 r243031  
     12019-03-15  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: HAR Extension for Resource Priority
     4        https://bugs.webkit.org/show_bug.cgi?id=195693
     5
     6        Reviewed by Devin Rousso.
     7
     8        * http/tests/inspector/network/har/har-basic-expected.txt:
     9        * http/tests/inspector/network/har/har-page-expected.txt:
     10
    1112019-03-15  Joseph Pecoraro  <pecoraro@apple.com>
    212

  • trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt

    r242896 r243031  
    137137        "serverIPAddress": "12.34.56.78",
    138138        "connection": "1",
    139         "_fetchType": "Network Load"
     139        "_fetchType": "Network Load",
     140        "_priority": "medium"
    140141      }
    141142    ]

  • trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt

    r232413 r243031  
    6262          "wait": "<filtered>",
    6363          "receive": "<filtered>"
    64         }
     64        },
     65        "_priority": "high"
    6566      },
    6667      {
    … …  
    103104          "wait": "<filtered>",
    104105          "receive": "<filtered>"
    105         }
     106        },
     107        "_priority": "high"
    106108      },
    107109      {
    … …  
    144146          "wait": "<filtered>",
    145147          "receive": "<filtered>"
    146         }
     148        },
     149        "_priority": "high"
    147150      },
    148151      {
    … …  
    192195          "wait": "<filtered>",
    193196          "receive": "<filtered>"
    194         }
     197        },
     198        "_priority": "medium"
    195199      },
    196200      {
    … …  
    246250          "wait": "<filtered>",
    247251          "receive": "<filtered>"
    248         }
     252        },
     253        "_priority": "medium"
    249254      },
    250255      {
    … …  
    299304          "wait": "<filtered>",
    300305          "receive": "<filtered>"
    301         }
     306        },
     307        "_priority": "medium"
    302308      },
    303309      {
    … …  
    352358          "wait": "<filtered>",
    353359          "receive": "<filtered>"
    354         }
     360        },
     361        "_priority": "medium"
    355362      },
    356363      {
    … …  
    405412          "wait": "<filtered>",
    406413          "receive": "<filtered>"
    407         }
     414        },
     415        "_priority": "medium"
    408416      },
    409417      {
    … …  
    462470          "wait": "<filtered>",
    463471          "receive": "<filtered>"
    464         }
     472        },
     473        "_priority": "medium"
    465474      },
    466475      {
    … …  
    525534          "wait": "<filtered>",
    526535          "receive": "<filtered>"
    527         }
     536        },
     537        "_priority": "medium"
    528538      },
    529539      {
    … …  
    592602          "wait": "<filtered>",
    593603          "receive": "<filtered>"
    594         }
     604        },
     605        "_priority": "medium"
    595606      },
    596607      {
    … …  
    663674          "wait": "<filtered>",
    664675          "receive": "<filtered>"
    665         }
     676        },
     677        "_priority": "medium"
    666678      },
    667679      {
    … …  
    738750          "wait": "<filtered>",
    739751          "receive": "<filtered>"
    740         }
     752        },
     753        "_priority": "medium"
    741754      }
    742755    ]

  • trunk/Source/WebInspectorUI/ChangeLog

    r243026 r243031  
     12019-03-15  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: HAR Extension for Resource Priority
     4        https://bugs.webkit.org/show_bug.cgi?id=195693
     5
     6        Reviewed by Devin Rousso.
     7
     8        * UserInterface/Controllers/HARBuilder.js:
     9        (WI.HARBuilder.entry):
     10        (WI.HARBuilder.priority):
     11        (WI.HARBuilder.networkPriorityFromHARPriority):
     12        Include priority custom extension.
     13
     14        * UserInterface/Models/LocalResource.js:
     15        (WI.LocalResource.fromHAREntry):
     16        Import priority.
     17
    1182019-03-15  Joseph Pecoraro  <pecoraro@apple.com>
    219

  • trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js

    r242948 r243031  
    115115            entry._fetchType = HARBuilder.fetchType(resource.responseSource);
    116116
    117         // FIXME: <https://webkit.org/b/195693> Web Inspector: HAR Extension for Resource Priority
     117        // WebKit Custom Field `_priority`.
     118        if (resource.priority !== WI.Resource.NetworkPriority.Unknown)
     119            entry._priority = HARBuilder.priority(resource.priority);
    118120
    119121        return entry;
    … …  
    316318        }
    317319
    318         console.assert(false);
     320        console.assert();
     321        return undefined;
     322    }
     323
     324    static priority(priority)
     325    {
     326        switch (priority) {
     327        case WI.Resource.NetworkPriority.Low:
     328            return "low";
     329        case WI.Resource.NetworkPriority.Medium:
     330            return "medium";
     331        case WI.Resource.NetworkPriority.High:
     332            return "high";
     333        }
     334
     335        console.assert();
    319336        return undefined;
    320337    }
    … …  
    345362
    346363        if (protocol)
    347             console.warn("Unknown HAR Protocol value", protocol);
     364            console.warn("Unknown HAR protocol value", protocol);
    348365        return null;
    349366    }
    … …  
    361378
    362379        if (fetchType)
    363             console.warn("Unknown HAR Protocol _fetchType", fetchType);
     380            console.warn("Unknown HAR _fetchType value", fetchType);
    364381        return WI.Resource.ResponseSource.Other;
    365382    }
     383
     384    static networkPriorityFromHARPriority(priority)
     385    {
     386        switch (priority) {
     387        case "low":
     388            return WI.Resource.NetworkPriority.Low;
     389        case "medium":
     390            return WI.Resource.NetworkPriority.Medium;
     391        case "high":
     392            return WI.Resource.NetworkPriority.High;
     393        }
     394
     395        if (priority)
     396            console.warn("Unknown HAR priority value", priority);
     397        return WI.Resource.NetworkPriority.Unknown;
     398    }
    366399};

  • trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js

    r242948 r243031  
    100100        // FIXME: <https://webkit.org/b/195695> Web Inspector: HAR Extension for `serverIPAddress` port number
    101101        // FIXME: <https://webkit.org/b/195694> Web Inspector: HAR Extension for Redirect Timing Info
    102         // FIXME: <https://webkit.org/b/195693> Web Inspector: HAR Extension for Resource Priority
    103102
    104103        let {request, response, startedDateTime, timings} = entry;
    … …  
    183182                responseSource: WI.HARBuilder.responseSourceFromHARFetchType(entry._fetchType),
    184183                protocol: WI.HARBuilder.protocolFromHARProtocol(response.httpVersion),
    185                 priority: null,
     184                priority: WI.HARBuilder.networkPriorityFromHARPriority(entry._priority),
    186185                remoteAddress: entry.serverIPAddress || null,
    187186                connectionIdentifier: entry.connection ? parseInt(entry.connection) : null,
Note: See TracChangeset for help on using the changeset viewer.