[network] Pass StreamingContentData to BinaryResourceView(Factory)

This is required to use BinaryResourceView(Factory) for arbitrary
NetworkRequests and not just individual websocket frames.

[email protected]

Bug: 375546679
Change-Id: I6d19d5636ee36426f9651074261f7fd66ac3013e
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5965156
Commit-Queue: Simon Zünd <[email protected]>
Reviewed-by: Philip Pfaffe <[email protected]>

Author: szuend

front_end/panels/network/BinaryResourceView.ts

@@ -6,6 +6,7 @@ import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import type * as Platform from '../../core/platform/platform.js';
+import type * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as SourceFrame from '../../ui/legacy/components/source_frame/source_frame.js';
 import * as UI from '../../ui/legacy/legacy.js';
 
@@ -70,12 +71,12 @@ export class BinaryResourceView extends UI.Widget.VBox {
   private lastView: UI.Widget.Widget|null;
 
   constructor(
-      base64content: string, contentUrl: Platform.DevToolsPath.UrlString,
+      content: TextUtils.StreamingContentData.StreamingContentData, contentUrl: Platform.DevToolsPath.UrlString,
       resourceType: Common.ResourceType.ResourceType) {
     super();
 
     this.binaryResourceViewFactory =
-        new SourceFrame.BinaryResourceViewFactory.BinaryResourceViewFactory(base64content, contentUrl, resourceType);
+        new SourceFrame.BinaryResourceViewFactory.BinaryResourceViewFactory(content, contentUrl, resourceType);
 
     this.toolbar = new UI.Toolbar.Toolbar('binary-view-toolbar', this.element);
 

front_end/panels/network/ResourceWebSocketFrameView.ts

@@ -469,7 +469,9 @@ export class ResourceWebSocketFrameNode extends DataGrid.SortableDataGrid.Sortab
     if (!this.binaryViewInternal) {
       if (this.dataTextInternal.length > 0) {
         this.binaryViewInternal = new BinaryResourceView(
-            this.dataTextInternal, Platform.DevToolsPath.EmptyUrlString, Common.ResourceType.resourceTypes.WebSocket);
+            TextUtils.StreamingContentData.StreamingContentData.from(
+                new TextUtils.ContentData.ContentData(this.dataTextInternal, true, 'applicaiton/octet-stream')),
+            Platform.DevToolsPath.EmptyUrlString, Common.ResourceType.resourceTypes.WebSocket);
       }
     }
     return this.binaryViewInternal;

front_end/ui/legacy/components/source_frame/BinaryResourceViewFactory.test.ts

@@ -11,10 +11,11 @@ import * as SourceFrame from './source_frame.js';
 
 describeWithEnvironment('BinaryResourceViewFactory', () => {
   it('interprets base64 content correctly', async () => {
-    const base64content = 'c2VuZGluZyB0aGlzIHV0Zi04IHN0cmluZyBhcyBhIGJpbmFyeSBtZXNzYWdlLi4u';
+    const base64content = new TextUtils.ContentData.ContentData(
+        'c2VuZGluZyB0aGlzIHV0Zi04IHN0cmluZyBhcyBhIGJpbmFyeSBtZXNzYWdlLi4u', true, '');
     const factory = new SourceFrame.BinaryResourceViewFactory.BinaryResourceViewFactory(
-        base64content, 'http://example.com' as Platform.DevToolsPath.UrlString,
-        Common.ResourceType.resourceTypes.WebSocket);
+        TextUtils.StreamingContentData.StreamingContentData.from(base64content),
+        'http://example.com' as Platform.DevToolsPath.UrlString, Common.ResourceType.resourceTypes.WebSocket);
 
     async function getResourceText(view: SourceFrame.ResourceSourceFrame.ResourceSourceFrame): Promise<string> {
       const contentData =

front_end/ui/legacy/components/source_frame/BinaryResourceViewFactory.ts

@@ -9,16 +9,16 @@ import * as TextUtils from '../../../../models/text_utils/text_utils.js';
 import {ResourceSourceFrame} from './ResourceSourceFrame.js';
 
 export class BinaryResourceViewFactory {
-  private base64content: string;
+  private streamingContent: TextUtils.StreamingContentData.StreamingContentData;
   private readonly contentUrl: Platform.DevToolsPath.UrlString;
   private readonly resourceType: Common.ResourceType.ResourceType;
   private arrayPromise: Promise<Uint8Array>|null;
   private hexPromise: Promise<string>|null;
   private utf8Promise: Promise<string>|null;
   constructor(
-      base64content: string, contentUrl: Platform.DevToolsPath.UrlString,
+      content: TextUtils.StreamingContentData.StreamingContentData, contentUrl: Platform.DevToolsPath.UrlString,
       resourceType: Common.ResourceType.ResourceType) {
-    this.base64content = base64content;
+    this.streamingContent = content;
     this.contentUrl = contentUrl;
     this.resourceType = resourceType;
     this.arrayPromise = null;
@@ -29,7 +29,7 @@ export class BinaryResourceViewFactory {
   private async fetchContentAsArray(): Promise<Uint8Array> {
     if (!this.arrayPromise) {
       this.arrayPromise = new Promise(async resolve => {
-        const fetchResponse = await fetch('data:;base64,' + this.base64content);
+        const fetchResponse = await fetch('data:;base64,' + this.streamingContent.content().base64);
         resolve(new Uint8Array(await fetchResponse.arrayBuffer()));
       });
     }
@@ -49,7 +49,7 @@ export class BinaryResourceViewFactory {
   }
 
   base64(): string {
-    return this.base64content;
+    return this.streamingContent.content().base64;
   }
 
   async utf8(): Promise<string> {
@@ -67,7 +67,7 @@ export class BinaryResourceViewFactory {
   createBase64View(): ResourceSourceFrame {
     return new ResourceSourceFrame(
         TextUtils.StaticContentProvider.StaticContentProvider.fromString(
-            this.contentUrl, this.resourceType, this.base64content),
+            this.contentUrl, this.resourceType, this.streamingContent.content().base64),
         this.resourceType.canonicalMimeType(), {lineNumbers: false, lineWrapping: true});
   }