Support DevTools for off-main-thread-fetch

third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 49 matching lines @@
 
 class WebSocketHandshakeRequest;
 class WebSocketHandshakeResponse;
 
 class CORE_EXPORT InspectorNetworkAgent final
     : public InspectorBaseAgent<protocol::Network::Metainfo> {
  public:
   static InspectorNetworkAgent* Create(InspectedFrames* inspected_frames) {
     return new InspectorNetworkAgent(inspected_frames);
   }
+  static InspectorNetworkAgent* CreateForWorker(
+      ExecutionContext* worker_global_scope) {
+    return new InspectorNetworkAgent(worker_global_scope);

[kinuko, 2017/05/22 07:51:02]

Could you update the parameter name as well?

[horo, 2017/05/22 10:42:39]

Done.

+  }
 
   void Restore() override;
 
   ~InspectorNetworkAgent() override;
   DECLARE_VIRTUAL_TRACE();
 
   // Probes.
-  void DidBlockRequest(LocalFrame*,
-                       const ResourceRequest&,
+  void DidBlockRequest(const ResourceRequest&,
                        DocumentLoader*,
                        const FetchInitiatorInfo&,
                        ResourceRequestBlockedReason);
   void DidChangeResourcePriority(unsigned long identifier,
                                  ResourceLoadPriority);
-  void WillSendRequest(LocalFrame*,
-                       unsigned long identifier,
+  void WillSendRequest(unsigned long identifier,
                        DocumentLoader*,
                        ResourceRequest&,
                        const ResourceResponse& redirect_response,
                        const FetchInitiatorInfo&);
   void MarkResourceAsCached(unsigned long identifier);
-  void DidReceiveResourceResponse(LocalFrame*,
-                                  unsigned long identifier,
+  void DidReceiveResourceResponse(unsigned long identifier,
                                   DocumentLoader*,
                                   const ResourceResponse&,
                                   Resource*);
-  void DidReceiveData(LocalFrame*,
-                      unsigned long identifier,
+  void DidReceiveData(unsigned long identifier,
+                      DocumentLoader*,
                       const char* data,
                       int data_length);
-  void DidReceiveEncodedDataLength(LocalFrame*,
-                                   unsigned long identifier,
+  void DidReceiveEncodedDataLength(unsigned long identifier,
                                    int encoded_data_length);
-  void DidFinishLoading(LocalFrame*,
-                        unsigned long identifier,
+  void DidFinishLoading(unsigned long identifier,
+                        DocumentLoader*,
                         double monotonic_finish_time,
                         int64_t encoded_data_length,
                         int64_t decoded_body_length);
   void DidReceiveCORSRedirectResponse(LocalFrame*,
                                       unsigned long identifier,
                                       DocumentLoader*,
                                       const ResourceResponse&,
                                       Resource*);
   void DidFailLoading(unsigned long identifier, const ResourceError&);
   void DidCommitLoad(LocalFrame*, DocumentLoader*);
@@ skipping 109 matching lines @@
   // Called from other agents.
   void SetHostId(const String&);
   bool FetchResourceContent(Document*,
                             const KURL&,
                             String* content,
                             bool* base64_encoded);
   bool CacheDisabled();
 
  private:
   explicit InspectorNetworkAgent(InspectedFrames*);
+  explicit InspectorNetworkAgent(ExecutionContext*);
 
   void Enable(int total_buffer_size, int resource_buffer_size);
-  void WillSendRequestInternal(LocalFrame*,
-                               unsigned long identifier,
+  void WillSendRequestInternal(unsigned long identifier,
                                DocumentLoader*,
                                const ResourceRequest&,
                                const ResourceResponse& redirect_response,
                                const FetchInitiatorInfo&);
   void DelayedRemoveReplayXHR(XMLHttpRequest*);
   void RemoveFinishedReplayXHRFired(TimerBase*);
   void DidFinishXHRInternal(ExecutionContext*,
                             XMLHttpRequest*,
                             ThreadableLoaderClient*,
                             const AtomicString&,
                             const String&,
                             bool);
 
   bool CanGetResponseBodyBlob(const String& request_id);
   void GetResponseBodyBlob(const String& request_id,
                            std::unique_ptr<GetResponseBodyCallback>);
   void ClearPendingRequestData();
 
+  // This is null while inspecting workers.
   Member<InspectedFrames> inspected_frames_;
+  // This is null while inspecting frames.
+  Member<ExecutionContext> worker_global_scope_;

[kinuko, 2017/05/22 07:51:02]

execution_context_ ?

[horo, 2017/05/22 10:42:39]

Done.

   String host_id_;
   Member<NetworkResourcesData> resources_data_;
 
   typedef HashMap<ThreadableLoaderClient*, unsigned long>
       ThreadableLoaderClientRequestIdMap;
 
   // Stores the pending ThreadableLoaderClient till an identifier for
   // the load is generated by the loader and passed to the inspector
   // via the documentThreadableLoaderStartedLoadingForClient() method.
   ThreadableLoaderClient* pending_request_;
   InspectorPageAgent::ResourceType pending_request_type_;
   ThreadableLoaderClientRequestIdMap known_request_id_map_;
 
   Member<XHRReplayData> pending_xhr_replay_data_;
 
   typedef HashMap<String, std::unique_ptr<protocol::Network::Initiator>>
       FrameNavigationInitiatorMap;
   FrameNavigationInitiatorMap frame_navigation_initiator_map_;
   HashSet<String> frames_with_scheduled_navigation_;
   HashSet<String> frames_with_scheduled_client_navigation_;
 
   HeapHashSet<Member<XMLHttpRequest>> replay_xhrs_;
   HeapHashSet<Member<XMLHttpRequest>> replay_xhrs_to_be_deleted_;
   TaskRunnerTimer<InspectorNetworkAgent> remove_finished_replay_xhr_timer_;
 };
 
 }  // namespace blink
 
 #endif  // !defined(InspectorNetworkAgent_h)