From 9ffe9a44664c2e7a54f79b236ed058d6979088d2 Mon Sep 17 00:00:00 2001 From: Eloston Date: Tue, 13 Sep 2016 22:21:36 -0700 Subject: [PATCH] Add fix-bundled-devtools.patch Remove redundant gyp flag Fix newline formatting in README.md --- README.md | 1 + resources/common/gyp_flags | 1 - resources/common/patches/patch_order | 1 + .../fix-bundled-devtools.patch | 52 +++++++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 resources/common/patches/ungoogled-chromium/fix-bundled-devtools.patch diff --git a/README.md b/README.md index d4459188..fc4c2c99 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ ungoogled-chromium is a set of configuration flags, patches, and custom scripts. * Strip binaries from the source tree, and use those provided by the system or build them from source * Add, modify, or disable features that inhibit control and transparency (these changes are minor and do not have significant impacts on the general user experience) + * [Features](#features) * [Supported platforms and distributions](#supported-platforms-and-distributions) * [Download pre-built packages](#download-pre-built-packages) diff --git a/resources/common/gyp_flags b/resources/common/gyp_flags index 9f78c6f6..755d1db2 100644 --- a/resources/common/gyp_flags +++ b/resources/common/gyp_flags @@ -10,7 +10,6 @@ enable_automation=0 enable_google_now=0 safe_browsing=0 enable_webrtc=0 -remoting=0 enable_hotwording=0 enable_hangout_services_extension=0 enable_wifi_bootstrapping=0 diff --git a/resources/common/patches/patch_order b/resources/common/patches/patch_order index a3b21786..6a1afb4e 100644 --- a/resources/common/patches/patch_order +++ b/resources/common/patches/patch_order @@ -68,4 +68,5 @@ ungoogled-chromium/disable-intranet-redirect-detector.patch ungoogled-chromium/fix-building-without-one-click-signin.patch ungoogled-chromium/enable-page-saving-on-more-pages.patch ungoogled-chromium/disable-windows-zone-identifier.patch +ungoogled-chromium/fix-bundled-devtools.patch diff --git a/resources/common/patches/ungoogled-chromium/fix-bundled-devtools.patch b/resources/common/patches/ungoogled-chromium/fix-bundled-devtools.patch new file mode 100644 index 00000000..7ebbdd5e --- /dev/null +++ b/resources/common/patches/ungoogled-chromium/fix-bundled-devtools.patch @@ -0,0 +1,52 @@ +# Replaces https://chrome-devtools-frontend.appspot.com with trk://chrome-devtools-frontend +# This fixes a bug encountered when running domain substitution + +--- a/third_party/WebKit/Source/devtools/front_end/Runtime.js ++++ b/third_party/WebKit/Source/devtools/front_end/Runtime.js +@@ -1165,7 +1165,7 @@ Runtime.experiments = new Runtime.ExperimentsSupport(); + Runtime._remoteBase = Runtime.queryParam("remoteBase"); + {(function validateRemoteBase() + { +- var remoteBaseRegexp = /^https:\/\/chrome-devtools-frontend\.appspot\.com\/serve_file\/@[0-9a-zA-Z]+\/?$/; ++ var remoteBaseRegexp = /^trk:\/\/chrome-devtools-frontend\/serve_file\/@[0-9a-zA-Z]+\/?$/; + if (Runtime._remoteBase && !remoteBaseRegexp.test(Runtime._remoteBase)) + Runtime._remoteBase = null; + })();} +--- a/third_party/WebKit/Source/devtools/front_end/devtools.js ++++ b/third_party/WebKit/Source/devtools/front_end/devtools.js +@@ -986,8 +986,8 @@ function installObjectObserve() + */ + function sanitizeRemoteFrontendUrl() + { +- var remoteBaseRegexp = /^https:\/\/chrome-devtools-frontend\.appspot\.com\/serve_file\/@[0-9a-zA-Z]+\/?$/; +- var remoteFrontendUrlRegexp = /^https:\/\/chrome-devtools-frontend\.appspot\.com\/serve_rev\/@?[0-9a-zA-Z]+\/(devtools|inspector)\.html$/; ++ var remoteBaseRegexp = /^trk:\/\/chrome-devtools-frontend\/serve_file\/@[0-9a-zA-Z]+\/?$/; ++ var remoteFrontendUrlRegexp = /^trk:\/\/chrome-devtools-frontend\/serve_rev\/@?[0-9a-zA-Z]+\/(devtools|inspector)\.html$/; + var queryParams = location.search; + if (!queryParams) + return; +--- a/third_party/WebKit/Source/devtools/front_end/inspector.html ++++ b/third_party/WebKit/Source/devtools/front_end/inspector.html +@@ -7,7 +7,7 @@ + + + +- ++ + + + +--- a/chrome/browser/ui/webui/devtools_ui.cc ++++ b/chrome/browser/ui/webui/devtools_ui.cc +@@ -30,9 +30,9 @@ std::string PathWithoutParams(const std::string& path) { + .path().substr(1); + } + +-const char kRemoteFrontendDomain[] = "chrome-devtools-frontend.8pp2p8t.qjz9zk"; ++const char kRemoteFrontendDomain[] = "chrome-devtools-frontend"; + const char kRemoteFrontendBase[] = +- "https://chrome-devtools-frontend.8pp2p8t.qjz9zk/"; ++ "trk://chrome-devtools-frontend/"; + const char kRemoteFrontendPath[] = "serve_file"; + const char kHttpNotFound[] = "HTTP/1.1 404 Not Found\n\n"; +