Commit e4644edd authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Commit Bot

Revert "[Kaleidoscope] Public side of the color code"

This reverts commit a1374a65.

Reason for revert: suspect causing compile failure on linux-chrome.

Sample build: https://ci.chromium.org/p/chrome/builders/ci/linux-chrome/12421

Sample log: 
https://logs.chromium.org/logs/chrome/buildbucket/cr-buildbucket.appspot.com/8874206257427658528/+/steps/compile/0/stdout?format=raw

---
Error processing node <?xml version="1.0" encoding="UTF-8"?>
<include file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-content-worker.js" name="IDR_KALEIDOSCOPE_CONTENT_WORKER_JS" type="BINDATA" use_base_dir="false" />: [Errno 2] No such file or directory: '../../out/Release/gen/chrome/browser/media/kaleidoscope/internal/resources/ks-content-worker.js'
---

Original change's description:
> [Kaleidoscope] Public side of the color code
> 
> Change-Id: I98b421dfac9adda34448c645c0432d7a9ad2455c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2303854
> Reviewed-by: Tommy Steimel <steimel@chromium.org>
> Commit-Queue: Becca Hughes <beccahughes@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#790186}

TBR=beccahughes@chromium.org,steimel@chromium.org

Change-Id: I53a2df3a2758584bda59ccd67a7088f6027a655a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2308618Reviewed-by: default avatarTakashi Sakamoto <tasak@google.com>
Commit-Queue: Takashi Sakamoto <tasak@google.com>
Cr-Commit-Position: refs/heads/master@{#790238}
parent 6138d9ca
...@@ -20,7 +20,7 @@ if (enable_kaleidoscope) { ...@@ -20,7 +20,7 @@ if (enable_kaleidoscope) {
] ]
deps = [ deps = [
"//chrome/browser/media/kaleidoscope/internal:kaleidoscope_strings", "//chrome/browser/media/kaleidoscope/internal:kaleidoscope_strings",
"//chrome/browser/media/kaleidoscope/internal/resources:all", "//chrome/browser/media/kaleidoscope/internal/resources:content",
"//chrome/browser/media/kaleidoscope/mojom:mojom_js", "//chrome/browser/media/kaleidoscope/mojom:mojom_js",
"//chrome/browser/resources/kaleidoscope:web_components", "//chrome/browser/resources/kaleidoscope:web_components",
"//url/mojom:url_mojom_gurl_js", "//url/mojom:url_mojom_gurl_js",
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<include name="IDR_KALEIDOSCOPE_CONTENT_CSS" file="internal/resources/content.css" type="chrome_html" flattenhtml="true" /> <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_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_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_HTML" file="internal/resources/kaleidoscope.html" type="BINDATA" />
<include name="IDR_KALEIDOSCOPE_JS" file="internal/resources/kaleidoscope.js" 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" /> <include name="IDR_KALEIDOSCOPE_MESSAGES_JS" file="internal/resources/messages.js" type="BINDATA" />
......
...@@ -73,11 +73,6 @@ content::WebUIDataSource* CreateUntrustedWebUIDataSource() { ...@@ -73,11 +73,6 @@ content::WebUIDataSource* CreateUntrustedWebUIDataSource() {
network::mojom::CSPDirectiveName::StyleSrc, network::mojom::CSPDirectiveName::StyleSrc,
"style-src chrome-untrusted://resources 'unsafe-inline' 'self';"); "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. // Allow images and videos from anywhere.
untrusted_source->OverrideContentSecurityPolicy( untrusted_source->OverrideContentSecurityPolicy(
network::mojom::CSPDirectiveName::ImgSrc, "img-src * data:;"); network::mojom::CSPDirectiveName::ImgSrc, "img-src * data:;");
...@@ -96,8 +91,6 @@ content::WebUIDataSource* CreateUntrustedWebUIDataSource() { ...@@ -96,8 +91,6 @@ content::WebUIDataSource* CreateUntrustedWebUIDataSource() {
untrusted_source->AddResourcePath("content.css", untrusted_source->AddResourcePath("content.css",
IDR_KALEIDOSCOPE_CONTENT_CSS); IDR_KALEIDOSCOPE_CONTENT_CSS);
untrusted_source->AddResourcePath("content.js", IDR_KALEIDOSCOPE_CONTENT_JS); 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", untrusted_source->AddResourcePath("messages.js",
IDR_KALEIDOSCOPE_MESSAGES_JS); IDR_KALEIDOSCOPE_MESSAGES_JS);
untrusted_source->AddResourcePath("toolbar.js", IDR_KALEIDOSCOPE_TOOLBAR_JS); untrusted_source->AddResourcePath("toolbar.js", IDR_KALEIDOSCOPE_TOOLBAR_JS);
...@@ -142,19 +135,10 @@ content::WebUIDataSource* CreateWebUIDataSource() { ...@@ -142,19 +135,10 @@ content::WebUIDataSource* CreateWebUIDataSource() {
html_source->SetRequestFilter(base::BindRepeating(OnShouldHandleRequest), html_source->SetRequestFilter(base::BindRepeating(OnShouldHandleRequest),
base::BindRepeating(OnStringsRequest)); 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) #if BUILDFLAG(ENABLE_KALEIDOSCOPE)
html_source->AddResourcePath("kaleidoscope.js", IDR_KALEIDOSCOPE_JS); html_source->AddResourcePath("kaleidoscope.js", IDR_KALEIDOSCOPE_JS);
html_source->AddResourcePath("messages.js", IDR_KALEIDOSCOPE_MESSAGES_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("utils.js", IDR_KALEIDOSCOPE_UTILS_JS);
html_source->AddResourcePath("content-worker.js",
IDR_KALEIDOSCOPE_CONTENT_WORKER_JS);
html_source->AddResourcePath("geometry.mojom-lite.js", html_source->AddResourcePath("geometry.mojom-lite.js",
IDR_GEOMETRY_MOJOM_LITE_JS); IDR_GEOMETRY_MOJOM_LITE_JS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment