⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 294374 in webkit


Ignore:
Timestamp:
May 17, 2022, 6:17:36 PM (4 years ago)
Author:
yurys@chromium.org
Message:

Web Inspector: support EventSource resource type in Network Panel
​https://bugs.webkit.org/show_bug.cgi?id=240326

Reviewed by Devin Rousso.

  • http/tests/inspector/network/eventsource-type-expected.txt: Added.
  • http/tests/inspector/network/eventsource-type.html: Added.
  • http/tests/inspector/network/resources/event-source.py: Added.

Web Inspector: support EventSource resource type in Network Panel
​https://bugs.webkit.org/show_bug.cgi?id=240326

  • inspector/protocol/Page.json: added EventSource resource type.

Web Inspector: support EventSource resource type in Network Panel
​https://bugs.webkit.org/show_bug.cgi?id=240326

Network requests initiated by EventSource now have their own requester
type which allows to distinguish them from other requests.

Test: http/tests/inspector/network/eventsource-type.html

  • inspector/agents/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::resourceTypeJSON):
(WebCore::InspectorPageAgent::inspectorResourceType):

  • inspector/agents/InspectorPageAgent.h:
  • page/EventSource.cpp:

(WebCore::EventSource::connect):

  • platform/network/ResourceRequestBase.h:

Web Inspector: support EventSource resource type in Network Panel
​https://bugs.webkit.org/show_bug.cgi?id=240326

EventSource initiated requests are now displayed with their own type
in the network panel.

  • Localizations/en.lproj/localizedStrings.js:
  • UserInterface/Controllers/NetworkManager.js:

(WI.NetworkManager.prototype.canBeOverridden):

  • UserInterface/Models/Resource.js:

(WI.Resource.displayNameForType):

  • UserInterface/Views/NetworkTableContentView.js:

(WI.NetworkTableContentView.displayNameForResource):

Canonical link: ​https://commits.webkit.org/250668@main

Location:
trunk
Files:
3 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/inspector/protocol/Page.json

    r269712 r294374  
    2828            "id": "ResourceType",
    2929            "type": "string",
    30             "enum": ["Document", "StyleSheet", "Image", "Font", "Script", "XHR", "Fetch", "Ping", "Beacon", "WebSocket", "Other"],
     30            "enum": ["Document", "StyleSheet", "Image", "Font", "Script", "XHR", "Fetch", "Ping", "Beacon", "WebSocket", "EventSource", "Other"],
    3131            "description": "Resource type as it was perceived by the rendering engine."
    3232        },

  • trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp

    r291992 r294374  
    236236    case WebSocketResource:
    237237        return Protocol::Page::ResourceType::WebSocket;
     238    case EventSourceResource:
     239        return Protocol::Page::ResourceType::EventSource;
    238240    case OtherResource:
    239241        return Protocol::Page::ResourceType::Other;
    … …  
    287289        case ResourceRequest::Requester::Main:
    288290            return InspectorPageAgent::DocumentResource;
     291        case ResourceRequest::Requester::EventSource:
     292            return InspectorPageAgent::EventSourceResource;
    289293        default:
    290294            return InspectorPageAgent::XHRResource;

  • trunk/Source/WebCore/inspector/agents/InspectorPageAgent.h

    r293195 r294374  
    7373        ApplicationManifestResource,
    7474#endif
     75        EventSourceResource,
    7576        OtherResource,
    7677    };

  • trunk/Source/WebCore/page/EventSource.cpp

    r293484 r294374  
    9696
    9797    ResourceRequest request { m_url };
     98    request.setRequester(ResourceRequest::Requester::EventSource);
    9899    request.setHTTPMethod("GET"_s);
    99100    request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream"_s);

  • trunk/Source/WebCore/platform/network/ResourceRequestBase.h

    r292477 r294374  
    168168    void setHiddenFromInspector(bool hiddenFromInspector) { m_hiddenFromInspector = hiddenFromInspector; }
    169169
    170     enum class Requester : uint8_t { Unspecified, Main, XHR, Fetch, Media, Model, ImportScripts, Ping, Beacon };
     170    enum class Requester : uint8_t { Unspecified, Main, XHR, Fetch, Media, Model, ImportScripts, Ping, Beacon, EventSource };
    171171    Requester requester() const { return m_requester; }
    172172    void setRequester(Requester requester) { m_requester = requester; }
    … …  
    433433        WebCore::ResourceRequestBase::Requester::ImportScripts,
    434434        WebCore::ResourceRequestBase::Requester::Ping,
    435         WebCore::ResourceRequestBase::Requester::Beacon
     435        WebCore::ResourceRequestBase::Requester::Beacon,
     436        WebCore::ResourceRequestBase::Requester::EventSource
    436437    >;
    437438};

  • trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

    r294166 r294374  
    644644localizedStrings["Event Handlers:"] = "Event Handlers:";
    645645localizedStrings["Event Listeners"] = "Event Listeners";
     646/* Display name for the type of network requests sent via EventSource API (https://developer.mozilla.org/en-US/docs/Web/API/EventSource) */
     647localizedStrings["EventSource"] = "EventSource";
     648/* Display name for the type of network requests sent via EventSource(s) API (https://developer.mozilla.org/en-US/docs/Web/API/EventSource) */
     649localizedStrings["EventSources"] = "EventSources";
    646650localizedStrings["Events"] = "Events";
    647651localizedStrings["Events:"] = "Events:";
    … …  
    17991803localizedStrings["document @ Network Tab Resource Type Column Value"] = "document";
    18001804localizedStrings["ensuring that common debugging functions are available on every page via the Console"] = "ensuring that common debugging functions are available on every page via the Console";
     1805/* Shown in the 'Type' column of the Network Table for EventSource resources. */
     1806localizedStrings["eventsource @ Network Tab Resource Type Column Value"] = "eventsource";
    18011807/* Shown in the 'Type' column of the Network Table for resources loaded via the 'fetch' method. */
    18021808localizedStrings["fetch @ Network Tab Resource Type Column Value"] = "fetch";

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

    r293409 r294374  
    469469        case WI.Resource.Type.Image:
    470470        case WI.Resource.Type.Font:
     471        case WI.Resource.Type.EventSource:
    471472        case WI.Resource.Type.Other:
    472473            break;

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

    r293409 r294374  
    173173                return WI.UIString("Sockets");
    174174            return WI.UIString("Socket");
     175        case WI.Resource.Type.EventSource:
     176            if (plural)
     177                return WI.UIString("EventSources", "Display name for the type of network requests sent via EventSource(s) API (https://developer.mozilla.org/en-US/docs/Web/API/EventSource)");
     178            return WI.UIString("EventSource", "Display name for the type of network requests sent via EventSource API (https://developer.mozilla.org/en-US/docs/Web/API/EventSource)");
    175179        case WI.Resource.Type.Other:
    176180            return WI.UIString("Other");
    … …  
    12861290    Beacon: "resource-type-beacon",
    12871291    WebSocket: "resource-type-websocket",
     1292    EventSource: "resource-type-eventsource",
    12881293    Other: "resource-type-other",
    12891294};

  • trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js

    r292037 r294374  
    224224        case WI.Resource.Type.WebSocket:
    225225            return WI.UIString("socket", "socket @ Network Tab Resource Type Column Value", "Shown in the 'Type' column of the Network Table for WebSocket resources.");
     226
     227        case WI.Resource.Type.EventSource:
     228            return WI.UIString("eventsource", "eventsource @ Network Tab Resource Type Column Value", "Shown in the 'Type' column of the Network Table for resources loaded via the EventSource API.");
    226229
    227230        case WI.Resource.Type.Other:
Note: See TracChangeset for help on using the changeset viewer.