[Kaleidoscope] Public side of the color code

Change-Id: I98b421dfac9adda34448c645c0432d7a9ad2455c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2303854Reviewed-by: Tommy Steimel <steimel@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790186}

chrome/browser/media/kaleidoscope/BUILD.gn

@@ -20,7 +20,7 @@ if (enable_kaleidoscope) {
     ]
     deps = [
       "//chrome/browser/media/kaleidoscope/internal:kaleidoscope_strings",
-      "//chrome/browser/media/kaleidoscope/internal/resources:content",
+      "//chrome/browser/media/kaleidoscope/internal/resources:all",
       "//chrome/browser/media/kaleidoscope/mojom:mojom_js",
       "//chrome/browser/resources/kaleidoscope:web_components",
       "//url/mojom:url_mojom_gurl_js",

chrome/browser/media/kaleidoscope/kaleidoscope_internal_resources.grd

@@ -18,6 +18,7 @@
       <include name="IDR_KALEIDOSCOPE_CONTENT_CSS" file="internal/resources/content.css" type="chrome_html" flattenhtml="true" />
       <include name="IDR_KALEIDOSCOPE_CONTENT_HTML" file="internal/resources/content.html" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_CONTENT_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-content.js" use_base_dir="false" type="BINDATA" />
+      <include name="IDR_KALEIDOSCOPE_CONTENT_WORKER_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-content-worker.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_HTML" file="internal/resources/kaleidoscope.html" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_JS" file="internal/resources/kaleidoscope.js" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_MESSAGES_JS" file="internal/resources/messages.js" type="BINDATA" />

chrome/browser/media/kaleidoscope/kaleidoscope_ui.cc

@@ -73,6 +73,11 @@ content::WebUIDataSource* CreateUntrustedWebUIDataSource() {
       network::mojom::CSPDirectiveName::StyleSrc,
       "style-src chrome-untrusted://resources 'unsafe-inline' 'self';");
 
+  // Allow workers from chrome-untrusted://kaleidoscope.
+  untrusted_source->OverrideContentSecurityPolicy(
+      network::mojom::CSPDirectiveName::WorkerSrc,
+      "worker-src chrome-untrusted://kaleidoscope;");
+
   // Allow images and videos from anywhere.
   untrusted_source->OverrideContentSecurityPolicy(
       network::mojom::CSPDirectiveName::ImgSrc, "img-src * data:;");
@@ -91,6 +96,8 @@ content::WebUIDataSource* CreateUntrustedWebUIDataSource() {
   untrusted_source->AddResourcePath("content.css",
                                     IDR_KALEIDOSCOPE_CONTENT_CSS);
   untrusted_source->AddResourcePath("content.js", IDR_KALEIDOSCOPE_CONTENT_JS);
+  untrusted_source->AddResourcePath("content-worker.js",
+                                    IDR_KALEIDOSCOPE_CONTENT_WORKER_JS);
   untrusted_source->AddResourcePath("messages.js",
                                     IDR_KALEIDOSCOPE_MESSAGES_JS);
   untrusted_source->AddResourcePath("toolbar.js", IDR_KALEIDOSCOPE_TOOLBAR_JS);
@@ -135,10 +142,19 @@ content::WebUIDataSource* CreateWebUIDataSource() {
   html_source->SetRequestFilter(base::BindRepeating(OnShouldHandleRequest),
                                 base::BindRepeating(OnStringsRequest));
 
+  // Allow workers from chrome://kaleidoscope (for testing).
+  html_source->OverrideContentSecurityPolicy(
+      network::mojom::CSPDirectiveName::WorkerSrc,
+      "worker-src chrome://kaleidoscope;");
+
 #if BUILDFLAG(ENABLE_KALEIDOSCOPE)
   html_source->AddResourcePath("kaleidoscope.js", IDR_KALEIDOSCOPE_JS);
   html_source->AddResourcePath("messages.js", IDR_KALEIDOSCOPE_MESSAGES_JS);
+
+  // TODO(beccahughes): Remove
   html_source->AddResourcePath("utils.js", IDR_KALEIDOSCOPE_UTILS_JS);
+  html_source->AddResourcePath("content-worker.js",
+                               IDR_KALEIDOSCOPE_CONTENT_WORKER_JS);
 
   html_source->AddResourcePath("geometry.mojom-lite.js",
                                IDR_GEOMETRY_MOJOM_LITE_JS);