0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug [FATAL:utf_string_conversions.cc(338)] Check failed: IsStringASCII(utf16). Tampermonkey • Userscript Sources

Browse source
This commit is contained in:
Carmelo Messina 2020-12-18 19:16:26 +01:00
parent 6f047a602e
commit 246a072ac6
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
build/patches/add-user-scripts.v5.patch
View file

@ -1,6 +1,6 @@
From: uazo <uazo@users.noreply.github.com>
Date: Wed, 16 Dec 2020 10:09:42 +0000
Subject: User scripts (preview)
Date: Fri, 18 Dec 2020 18:11:49 +0000
Subject: Experimental user scripts support (preview
---
chrome/android/BUILD.gn | 2 +
@ -42,7 +42,7 @@ Subject: User scripts (preview)
components/user_scripts/browser/BUILD.gn | 68 ++
.../user_scripts/browser/file_task_runner.cc | 40 +
.../user_scripts/browser/file_task_runner.h | 34 +
.../browser/user_script_loader.cc | 638 ++++++++++++++
.../browser/user_script_loader.cc | 640 ++++++++++++++
.../user_scripts/browser/user_script_loader.h | 172 ++++
.../browser/user_script_pref_info.cc | 34 +
.../browser/user_script_pref_info.h | 58 ++
@ -104,7 +104,7 @@ Subject: User scripts (preview)
.../strings/userscripts_strings.grdp | 50 ++
tools/gritsettings/resource_ids.spec | 3 +
.../chromium/ui/base/SelectFileDialog.java | 3 +-
101 files changed, 8823 insertions(+), 4 deletions(-)
101 files changed, 8825 insertions(+), 4 deletions(-)
create mode 100755 components/user_scripts/android/BUILD.gn
create mode 100755 components/user_scripts/android/java/res/drawable-hdpi/userscript_off.png
create mode 100755 components/user_scripts/android/java/res/drawable-hdpi/userscript_on.png
@ -329,7 +329,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#include "components/version_info/version_info.h"
#include "components/viz/common/features.h"
#include "components/viz/common/switches.h"
@@ -6253,6 +6254,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6257,6 +6258,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kUserDataSnapshot)},
#endif
@ -343,7 +343,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -4684,6 +4684,11 @@ const char kUserDataSnapshotDescription[] =
@@ -4687,6 +4687,11 @@ const char kUserDataSnapshotDescription[] =
"update and restoring them after a version rollback.";
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
@ -358,7 +358,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -2732,6 +2732,9 @@ extern const char kUserDataSnapshotName[];
@@ -2735,6 +2735,9 @@ extern const char kUserDataSnapshotName[];
extern const char kUserDataSnapshotDescription[];
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
@ -2149,7 +2149,7 @@ diff --git a/components/user_scripts/browser/user_script_loader.cc b/components/
new file mode 100755
--- /dev/null
+++ b/components/user_scripts/browser/user_script_loader.cc
@@ -0,0 +1,638 @@
@@ -0,0 +1,640 @@
+/*
+ This file is part of Bromite.
+
@ -2750,7 +2750,9 @@ new file mode 100755
+ base::string16 file_display_name;
+ base::MaybeGetFileDisplayName(script_path, &file_display_name);
+
+ const std::string display_name = base::UTF16ToASCII(file_display_name);
+ std::string display_name = script_path.BaseName().value();
+ if (base::IsStringASCII(file_display_name))
+ display_name = base::UTF16ToASCII(file_display_name);
+
+ GetUserScriptsFileTaskRunner()->PostTask(
+ FROM_HERE,