|
@@ -8,10 +8,10 @@ WebPreferences of in-process child windows, rather than relying on
|
|
|
process-level command line switches, as before.
|
|
|
|
|
|
diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
|
|
|
-index f17c7ae24086ab0112bd1245291f6f512a74e223..a1a23d263e4842996c0f8dde4dca8d8b35802fda 100644
|
|
|
+index 2494aeb1cd363c07e1b662743b1453da646fe17d..927dce4724263b45ff27b046ef024ae2a04706a9 100644
|
|
|
--- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
|
|
|
+++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
|
|
|
-@@ -147,6 +147,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
|
|
|
+@@ -148,6 +148,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
|
|
|
out->v8_cache_options = data.v8_cache_options();
|
|
|
out->record_whole_document = data.record_whole_document();
|
|
|
out->stylus_handwriting_enabled = data.stylus_handwriting_enabled();
|
|
@@ -32,7 +32,7 @@ index f17c7ae24086ab0112bd1245291f6f512a74e223..a1a23d263e4842996c0f8dde4dca8d8b
|
|
|
out->accelerated_video_decode_enabled =
|
|
|
data.accelerated_video_decode_enabled();
|
|
|
diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
|
|
|
-index 95e6b4c64bca410586378c88df288ef2bb0c6992..783c44be399a3bcf251b52c47340c26d6d962747 100644
|
|
|
+index b7b817c01fcec0bf60bd88544ec66b53248a1ed8..82a03a14e19840924c90cb768a3bbd715fdf82d4 100644
|
|
|
--- a/third_party/blink/public/common/web_preferences/web_preferences.h
|
|
|
+++ b/third_party/blink/public/common/web_preferences/web_preferences.h
|
|
|
@@ -9,6 +9,7 @@
|
|
@@ -43,7 +43,7 @@ index 95e6b4c64bca410586378c88df288ef2bb0c6992..783c44be399a3bcf251b52c47340c26d
|
|
|
#include "build/build_config.h"
|
|
|
#include "net/nqe/effective_connection_type.h"
|
|
|
#include "third_party/blink/public/common/common_export.h"
|
|
|
-@@ -442,6 +443,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
|
|
|
+@@ -447,6 +448,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
|
|
|
// when feature DynamicSafeAreaInsets is enabled.
|
|
|
bool dynamic_safe_area_insets_enabled = false;
|
|
|
|
|
@@ -65,18 +65,18 @@ index 95e6b4c64bca410586378c88df288ef2bb0c6992..783c44be399a3bcf251b52c47340c26d
|
|
|
// chrome, except for the cases where it would require lots of extra work for
|
|
|
// the embedder to use the same default value.
|
|
|
diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
|
|
|
-index 68f936bc7103accc4521da0a12e5e0fad05cc86c..24f209d5694cdf7128a8fb58af4957f0905058a0 100644
|
|
|
+index d686fc396ce4d53c209be5cbb4d4ddfecc4cca1b..cd1110adc4131404ba32595ea5533b220554b0c4 100644
|
|
|
--- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
|
|
|
+++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
|
|
|
-@@ -6,6 +6,7 @@
|
|
|
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_WEB_PREFERENCES_WEB_PREFERENCES_MOJOM_TRAITS_H_
|
|
|
+@@ -8,6 +8,7 @@
|
|
|
+ #include <optional>
|
|
|
|
|
|
#include "build/build_config.h"
|
|
|
+#include "mojo/public/cpp/base/file_path_mojom_traits.h"
|
|
|
#include "mojo/public/cpp/bindings/struct_traits.h"
|
|
|
#include "net/nqe/effective_connection_type.h"
|
|
|
#include "third_party/blink/public/common/common_export.h"
|
|
|
-@@ -434,6 +435,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
|
|
|
+@@ -437,6 +438,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
|
|
|
return r.stylus_handwriting_enabled;
|
|
|
}
|
|
|
|
|
@@ -130,18 +130,22 @@ index 68f936bc7103accc4521da0a12e5e0fad05cc86c..24f209d5694cdf7128a8fb58af4957f0
|
|
|
return r.cookie_enabled;
|
|
|
}
|
|
|
diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
|
|
|
-index f3f00b8430d131627191e0e689ab54256600e852..c88a348b9b991081609d5085890a0c2538555569 100644
|
|
|
+index 6678fc10d72e6c49ba729d5f44626f9a29934a3b..57f8c71bd0e3b1e09510184888636004a949c192 100644
|
|
|
--- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
|
|
|
+++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
|
|
|
-@@ -9,6 +9,7 @@ import "third_party/blink/public/mojom/css/preferred_contrast.mojom";
|
|
|
+@@ -8,9 +8,11 @@ import "third_party/blink/public/mojom/css/preferred_color_scheme.mojom";
|
|
|
+ import "third_party/blink/public/mojom/css/preferred_contrast.mojom";
|
|
|
import "third_party/blink/public/mojom/v8_cache_options.mojom";
|
|
|
import "url/mojom/url.mojom";
|
|
|
- import "mojo/public/mojom/base/string16.mojom";
|
|
|
+import "mojo/public/mojom/base/file_path.mojom";
|
|
|
+ import "mojo/public/mojom/base/string16.mojom";
|
|
|
+ import "skia/public/mojom/skcolor.mojom";
|
|
|
|
|
|
++
|
|
|
enum PointerType {
|
|
|
kPointerNone = 1, // 1 << 0
|
|
|
-@@ -217,6 +218,19 @@ struct WebPreferences {
|
|
|
+ kPointerFirstType = kPointerNone,
|
|
|
+@@ -218,6 +220,19 @@ struct WebPreferences {
|
|
|
// If true, stylus handwriting recognition to text input will be available in
|
|
|
// editable input fields which are non-password type.
|
|
|
bool stylus_handwriting_enabled;
|