Title: [243031] trunk
Revision
243031
Author
joep...@webkit.org
Date
2019-03-15 20:14:52 -0700 (Fri, 15 Mar 2019)

Log 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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (243030 => 243031)


--- trunk/LayoutTests/ChangeLog	2019-03-16 02:48:57 UTC (rev 243030)
+++ trunk/LayoutTests/ChangeLog	2019-03-16 03:14:52 UTC (rev 243031)
@@ -1,5 +1,15 @@
 2019-03-15  Joseph Pecoraro  <pecor...@apple.com>
 
+        Web Inspector: HAR Extension for Resource Priority
+        https://bugs.webkit.org/show_bug.cgi?id=195693
+
+        Reviewed by Devin Rousso.
+
+        * http/tests/inspector/network/har/har-basic-expected.txt:
+        * http/tests/inspector/network/har/har-page-expected.txt:
+
+2019-03-15  Joseph Pecoraro  <pecor...@apple.com>
+
         Web Inspector: Timelines - Import / Export Timeline Recordings
         https://bugs.webkit.org/show_bug.cgi?id=195709
         <rdar://problem/23188921>

Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt (243030 => 243031)


--- trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt	2019-03-16 02:48:57 UTC (rev 243030)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt	2019-03-16 03:14:52 UTC (rev 243031)
@@ -136,7 +136,8 @@
         },
         "serverIPAddress": "12.34.56.78",
         "connection": "1",
-        "_fetchType": "Network Load"
+        "_fetchType": "Network Load",
+        "_priority": "medium"
       }
     ]
   }

Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt (243030 => 243031)


--- trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt	2019-03-16 02:48:57 UTC (rev 243030)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt	2019-03-16 03:14:52 UTC (rev 243031)
@@ -61,7 +61,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "high"
       },
       {
         "pageref": "page_0",
@@ -102,7 +103,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "high"
       },
       {
         "pageref": "page_0",
@@ -143,7 +145,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "high"
       },
       {
         "pageref": "page_0",
@@ -191,7 +194,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "medium"
       },
       {
         "pageref": "page_0",
@@ -245,7 +249,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "medium"
       },
       {
         "pageref": "page_0",
@@ -298,7 +303,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "medium"
       },
       {
         "pageref": "page_0",
@@ -351,7 +357,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "medium"
       },
       {
         "pageref": "page_0",
@@ -404,7 +411,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "medium"
       },
       {
         "pageref": "page_0",
@@ -461,7 +469,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "medium"
       },
       {
         "pageref": "page_0",
@@ -524,7 +533,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "medium"
       },
       {
         "pageref": "page_0",
@@ -591,7 +601,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "medium"
       },
       {
         "pageref": "page_0",
@@ -662,7 +673,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "medium"
       },
       {
         "pageref": "page_0",
@@ -737,7 +749,8 @@
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        }
+        },
+        "_priority": "medium"
       }
     ]
   }

Modified: trunk/Source/WebInspectorUI/ChangeLog (243030 => 243031)


--- trunk/Source/WebInspectorUI/ChangeLog	2019-03-16 02:48:57 UTC (rev 243030)
+++ trunk/Source/WebInspectorUI/ChangeLog	2019-03-16 03:14:52 UTC (rev 243031)
@@ -1,5 +1,22 @@
 2019-03-15  Joseph Pecoraro  <pecor...@apple.com>
 
+        Web Inspector: HAR Extension for Resource Priority
+        https://bugs.webkit.org/show_bug.cgi?id=195693
+
+        Reviewed by Devin Rousso.
+
+        * 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.
+
+2019-03-15  Joseph Pecoraro  <pecor...@apple.com>
+
         Web Inspector: CPU Usage Timeline - Give long thread names a tooltip if they could be ellipsized
         https://bugs.webkit.org/show_bug.cgi?id=195314
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js (243030 => 243031)


--- trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js	2019-03-16 02:48:57 UTC (rev 243030)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js	2019-03-16 03:14:52 UTC (rev 243031)
@@ -114,7 +114,9 @@
         if (resource.responseSource !== WI.Resource.ResponseSource.Unknown)
             entry._fetchType = HARBuilder.fetchType(resource.responseSource);
 
-        // FIXME: <https://webkit.org/b/195693> Web Inspector: HAR Extension for Resource Priority
+        // WebKit Custom Field `_priority`.
+        if (resource.priority !== WI.Resource.NetworkPriority.Unknown)
+            entry._priority = HARBuilder.priority(resource.priority);
 
         return entry;
     }
@@ -315,10 +317,25 @@
             return "Service Worker";
         }
 
-        console.assert(false);
+        console.assert();
         return undefined;
     }
 
+    static priority(priority)
+    {
+        switch (priority) {
+        case WI.Resource.NetworkPriority.Low:
+            return "low";
+        case WI.Resource.NetworkPriority.Medium:
+            return "medium";
+        case WI.Resource.NetworkPriority.High:
+            return "high";
+        }
+
+        console.assert();
+        return undefined;
+    }
+
     // Consuming.
 
     static dateFromHARDate(isoString)
@@ -344,7 +361,7 @@
         }
 
         if (protocol)
-            console.warn("Unknown HAR Protocol value", protocol);
+            console.warn("Unknown HAR protocol value", protocol);
         return null;
     }
 
@@ -360,7 +377,23 @@
         }
 
         if (fetchType)
-            console.warn("Unknown HAR Protocol _fetchType", fetchType);
+            console.warn("Unknown HAR _fetchType value", fetchType);
         return WI.Resource.ResponseSource.Other;
     }
+
+    static networkPriorityFromHARPriority(priority)
+    {
+        switch (priority) {
+        case "low":
+            return WI.Resource.NetworkPriority.Low;
+        case "medium":
+            return WI.Resource.NetworkPriority.Medium;
+        case "high":
+            return WI.Resource.NetworkPriority.High;
+        }
+
+        if (priority)
+            console.warn("Unknown HAR priority value", priority);
+        return WI.Resource.NetworkPriority.Unknown;
+    }
 };

Modified: trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js (243030 => 243031)


--- trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js	2019-03-16 02:48:57 UTC (rev 243030)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js	2019-03-16 03:14:52 UTC (rev 243031)
@@ -99,7 +99,6 @@
     {
         // FIXME: <https://webkit.org/b/195695> Web Inspector: HAR Extension for `serverIPAddress` port number
         // FIXME: <https://webkit.org/b/195694> Web Inspector: HAR Extension for Redirect Timing Info
-        // FIXME: <https://webkit.org/b/195693> Web Inspector: HAR Extension for Resource Priority
 
         let {request, response, startedDateTime, timings} = entry;
         let requestSentWalltime = WI.HARBuilder.dateFromHARDate(startedDateTime) / 1000;
@@ -182,7 +181,7 @@
             metrics: {
                 responseSource: WI.HARBuilder.responseSourceFromHARFetchType(entry._fetchType),
                 protocol: WI.HARBuilder.protocolFromHARProtocol(response.httpVersion),
-                priority: null,
+                priority: WI.HARBuilder.networkPriorityFromHARPriority(entry._priority),
                 remoteAddress: entry.serverIPAddress || null,
                 connectionIdentifier: entry.connection ? parseInt(entry.connection) : null,
                 requestHeaderBytesSent: request.headersSize >= 0 ? request.headersSize : NaN,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to