Changeset 225708 in webkit

Timestamp:

Dec 8, 2017, 2:57:30 PM (7 years ago)

Author:

Joseph Pecoraro

Message:

ServiceWorker Inspector: Should be able to see image content from CacheStorage.add(url) network request
​https://bugs.webkit.org/show_bug.cgi?id=180506

Reviewed by Brian Burg.

No test as this only happens inside a ServiceWorker inspector which
we don't yet have a way to test. In a Page Inspector, the
CacheStorage.add network request already behaves as expected.

• inspector/NetworkResourcesData.cpp:

(WebCore::NetworkResourcesData::responseReceived):
(WebCore::shouldBufferResourceData):

• inspector/NetworkResourcesData.h:

(WebCore::NetworkResourcesData::ResourceData::forceBufferData const):
(WebCore::NetworkResourcesData::ResourceData::setForceBufferData):
Provide a way to force buffering in NetworkResourceData.

• inspector/agents/InspectorNetworkAgent.cpp:

(WebCore::InspectorNetworkAgent::didReceiveResponse):

• inspector/agents/InspectorNetworkAgent.h:
• inspector/agents/page/PageNetworkAgent.h:
• inspector/agents/worker/WorkerNetworkAgent.h:

Enable force buffering in a Worker Network Agent.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/NetworkResourcesData.cpp (modified) (3 diffs)
• inspector/NetworkResourcesData.h (modified) (3 diffs)
• inspector/agents/InspectorNetworkAgent.cpp (modified) (1 diff)
• inspector/agents/InspectorNetworkAgent.h (modified) (1 diff)
• inspector/agents/page/PageNetworkAgent.h (modified) (1 diff)
• inspector/agents/worker/WorkerNetworkAgent.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-08  Joseph Pecoraro  <pecoraro@apple.com>
+
+        ServiceWorker Inspector: Should be able to see image content from CacheStorage.add(url) network request
+        https://bugs.webkit.org/show_bug.cgi?id=180506
+
+        Reviewed by Brian Burg.
+
+        No test as this only happens inside a ServiceWorker inspector which
+        we don't yet have a way to test. In a Page Inspector, the
+        CacheStorage.add network request already behaves as expected.
+
+        * inspector/NetworkResourcesData.cpp:
+        (WebCore::NetworkResourcesData::responseReceived):
+        (WebCore::shouldBufferResourceData):
+        * inspector/NetworkResourcesData.h:
+        (WebCore::NetworkResourcesData::ResourceData::forceBufferData const):
+        (WebCore::NetworkResourcesData::ResourceData::setForceBufferData):
+        Provide a way to force buffering in NetworkResourceData.
+
+        * inspector/agents/InspectorNetworkAgent.cpp:
+        (WebCore::InspectorNetworkAgent::didReceiveResponse):
+        * inspector/agents/InspectorNetworkAgent.h:
+        * inspector/agents/page/PageNetworkAgent.h:
+        * inspector/agents/worker/WorkerNetworkAgent.h:
+        Enable force buffering in a Worker Network Agent.
+
 2017-12-08  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/inspector/NetworkResourcesData.cpp

@@ -151 +151 @@
 }
 
-void NetworkResourcesData::responseReceived(const String& requestId, const String& frameId, const ResourceResponse& response, InspectorPageAgent::ResourceType type)
+void NetworkResourcesData::responseReceived(const String& requestId, const String& frameId, const ResourceResponse& response, InspectorPageAgent::ResourceType type, bool forceBufferData)
 {
     ResourceData* resourceData = resourceDataForRequestId(requestId);
@@ -161 +161 @@
     resourceData->setHTTPStatusCode(response.httpStatusCode());
     resourceData->setType(type);
+    resourceData->setForceBufferData(forceBufferData);
 
     if (InspectorNetworkAgent::shouldTreatAsText(response.mimeType()))
@@ -206 +207 @@
 static bool shouldBufferResourceData(const NetworkResourcesData::ResourceData& resourceData)
 {
+    if (resourceData.forceBufferData())
+        return true;
+
     if (resourceData.decoder())
         return true;

trunk/Source/WebCore/inspector/NetworkResourcesData.h

@@ -88 +88 @@
         void setCachedResource(CachedResource* cachedResource) { m_cachedResource = cachedResource; }
 
+        bool forceBufferData() const { return m_forceBufferData; }
+        void setForceBufferData(bool force) { m_forceBufferData = force; }
+
     private:
         bool hasData() const { return m_dataBuffer; }
@@ -108 +111 @@
         bool m_isContentEvicted { false };
         bool m_base64Encoded { false };
+        bool m_forceBufferData { false };
     };
 
@@ -115 +119 @@
     void resourceCreated(const String& requestId, const String& loaderId, InspectorPageAgent::ResourceType);
     void resourceCreated(const String& requestId, const String& loaderId, CachedResource&);
-    void responseReceived(const String& requestId, const String& frameId, const ResourceResponse&, InspectorPageAgent::ResourceType);
+    void responseReceived(const String& requestId, const String& frameId, const ResourceResponse&, InspectorPageAgent::ResourceType, bool forceBufferData);
     void setResourceType(const String& requestId, InspectorPageAgent::ResourceType);
     InspectorPageAgent::ResourceType resourceType(const String& requestId);

trunk/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp

@@ -451 +451 @@
     String loaderId = loaderIdentifier(loader);
 
-    m_resourcesData->responseReceived(requestId, frameId, response, type);
+    m_resourcesData->responseReceived(requestId, frameId, response, type, shouldForceBufferingNetworkResourceData());
 
     m_frontendDispatcher->responseReceived(requestId, frameId, loaderId, timestamp(), InspectorPageAgent::resourceTypeJSON(type), resourceResponse);

trunk/Source/WebCore/inspector/agents/InspectorNetworkAgent.h

@@ -124 +124 @@
     virtual void setResourceCachingDisabled(bool) = 0;
     virtual ScriptExecutionContext* scriptExecutionContext(ErrorString&, const String& frameId) = 0;
+    virtual bool shouldForceBufferingNetworkResourceData() const = 0;
 
 private:

trunk/Source/WebCore/inspector/agents/page/PageNetworkAgent.h

@@ -43 +43 @@
     void setResourceCachingDisabled(bool) final;
     ScriptExecutionContext* scriptExecutionContext(ErrorString&, const String& frameId) final;
+    bool shouldForceBufferingNetworkResourceData() const final { return false; }
 
     InspectorPageAgent* m_pageAgent { nullptr };

trunk/Source/WebCore/inspector/agents/worker/WorkerNetworkAgent.h

@@ -43 +43 @@
     void setResourceCachingDisabled(bool) final;
     ScriptExecutionContext* scriptExecutionContext(ErrorString&, const String& frameId) final;
+    bool shouldForceBufferingNetworkResourceData() const final { return true; }
 
     WorkerGlobalScope& m_workerGlobalScope;