v115 to be checked
This commit is contained in:
Carmelo Messina
@@ -11,7 +11,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
.../optimization_guide_keyed_service.cc | 1 -
|
||||
.../predictors/loading_predictor_config.cc | 4 +-
|
||||
chrome/common/chrome_features.cc | 10 ++---
|
||||
.../browser/autocomplete_controller.cc | 2 +
|
||||
.../optimization_guide/core/hints_fetcher.cc | 1 +
|
||||
.../optimization_guide/core/hints_manager.cc | 5 +++
|
||||
.../core/optimization_guide_features.cc | 38 +++++++++----------
|
||||
@@ -21,12 +20,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
components/permissions/features.cc | 8 ++--
|
||||
third_party/blink/common/features.cc | 8 +---
|
||||
.../platform/runtime_enabled_features.json5 | 2 +-
|
||||
16 files changed, 54 insertions(+), 51 deletions(-)
|
||||
15 files changed, 52 insertions(+), 51 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_features.cc
|
||||
--- a/chrome/browser/browser_features.cc
|
||||
+++ b/chrome/browser/browser_features.cc
|
||||
@@ -249,17 +249,17 @@ BASE_FEATURE(kIncomingCallNotifications,
|
||||
@@ -233,17 +233,17 @@ BASE_FEATURE(kIncomingCallNotifications,
|
||||
|
||||
// Enables omnibox trigger prerendering.
|
||||
BASE_FEATURE(kOmniboxTriggerForPrerender2,
|
||||
@@ -79,7 +78,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/
|
||||
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
|
||||
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
|
||||
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
|
||||
@@ -334,7 +334,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
|
||||
@@ -332,7 +332,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
|
||||
void OptimizationGuideKeyedService::RegisterOptimizationTypes(
|
||||
const std::vector<optimization_guide::proto::OptimizationType>&
|
||||
optimization_types) {
|
||||
@@ -104,7 +103,7 @@ diff --git a/chrome/browser/predictors/loading_predictor_config.cc b/chrome/brow
|
||||
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||||
--- a/chrome/common/chrome_features.cc
|
||||
+++ b/chrome/common/chrome_features.cc
|
||||
@@ -903,8 +903,8 @@ BASE_FEATURE(kPermissionAuditing,
|
||||
@@ -930,8 +930,8 @@ BASE_FEATURE(kPermissionAuditing,
|
||||
// Enables using the prediction service for permission prompts. We will keep
|
||||
// this feature in order to allow us to update the holdback chance via finch.
|
||||
BASE_FEATURE(kPermissionPredictions,
|
||||
@@ -115,7 +114,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||||
|
||||
// The holdback chance is 30% but it can also be configured/updated
|
||||
// through finch if needed.
|
||||
@@ -915,8 +915,8 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
|
||||
@@ -942,8 +942,8 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
|
||||
|
||||
// Enables using the prediction service for geolocation permission prompts.
|
||||
BASE_FEATURE(kPermissionGeolocationPredictions,
|
||||
@@ -126,7 +125,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||||
|
||||
const base::FeatureParam<double>
|
||||
kPermissionGeolocationPredictionsHoldbackChance(
|
||||
@@ -932,7 +932,7 @@ BASE_FEATURE(kPluginVm, "PluginVm", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
@@ -959,7 +959,7 @@ BASE_FEATURE(kPluginVm, "PluginVm", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
// Allows Chrome to do preconnect when prerender fails.
|
||||
BASE_FEATURE(kPrerenderFallbackToPreconnect,
|
||||
"PrerenderFallbackToPreconnect",
|
||||
@@ -135,25 +134,6 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||||
|
||||
BASE_FEATURE(kPrivacyGuideAndroid,
|
||||
"PrivacyGuideAndroid",
|
||||
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
|
||||
--- a/components/omnibox/browser/autocomplete_controller.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_controller.cc
|
||||
@@ -1561,6 +1561,7 @@ void AutocompleteController::RunUrlScoringModel(
|
||||
base::OnceClosure completion_callback) {
|
||||
TRACE_EVENT0("omnibox", "AutocompleteController::RunUrlScoringModel");
|
||||
|
||||
+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
|
||||
auto barrier_callback =
|
||||
base::BarrierCallback<std::tuple<absl::optional<float>, size_t, GURL>>(
|
||||
result_.size(),
|
||||
@@ -1583,6 +1584,7 @@ void AutocompleteController::RunUrlScoringModel(
|
||||
std::make_tuple(absl::nullopt, match_index, match->destination_url));
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void AutocompleteController::CancelUrlScoringModel() {
|
||||
diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc
|
||||
--- a/components/optimization_guide/core/hints_fetcher.cc
|
||||
+++ b/components/optimization_guide/core/hints_fetcher.cc
|
||||
@@ -176,7 +156,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
|
||||
switch (optimization_type_decision) {
|
||||
case OptimizationTypeDecision::kAllowedByOptimizationFilter:
|
||||
case OptimizationTypeDecision::kAllowedByHint:
|
||||
@@ -1061,6 +1062,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
|
||||
@@ -1063,6 +1064,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
|
||||
proto::RequestContext request_context,
|
||||
OnDemandOptimizationGuideDecisionRepeatingCallback callback) {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
@@ -184,7 +164,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
|
||||
|
||||
// This set contains URLs that require some information to be fetched, whether
|
||||
// that be a URL-keyed hint or a host-keyed hint.
|
||||
@@ -1376,6 +1378,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
|
||||
@@ -1378,6 +1380,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
|
||||
bool skip_cache,
|
||||
OptimizationMetadata* optimization_metadata) {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
@@ -197,7 +177,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
|
||||
diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc
|
||||
--- a/components/optimization_guide/core/optimization_guide_features.cc
|
||||
+++ b/components/optimization_guide/core/optimization_guide_features.cc
|
||||
@@ -80,17 +80,17 @@ bool IsSupportedLocaleForFeature(
|
||||
@@ -87,17 +87,17 @@ bool IsSupportedLocaleForFeature(
|
||||
// Enables the syncing of the Optimization Hints component, which provides
|
||||
// hints for what optimizations can be applied on a page load.
|
||||
BASE_FEATURE(kOptimizationHints,
|
||||
@@ -221,7 +201,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
|
||||
|
||||
// Enables performance info in the context menu and fetching from a remote
|
||||
// Optimization Guide Service.
|
||||
@@ -100,17 +100,13 @@ BASE_FEATURE(kContextMenuPerformanceInfoAndRemoteHintFetching,
|
||||
@@ -107,17 +107,13 @@ BASE_FEATURE(kContextMenuPerformanceInfoAndRemoteHintFetching,
|
||||
|
||||
// Enables the prediction of optimization targets.
|
||||
BASE_FEATURE(kOptimizationTargetPrediction,
|
||||
@@ -243,7 +223,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
|
||||
);
|
||||
|
||||
// Enables page content to be annotated.
|
||||
@@ -120,8 +116,8 @@ BASE_FEATURE(kPageContentAnnotations,
|
||||
@@ -127,8 +123,8 @@ BASE_FEATURE(kPageContentAnnotations,
|
||||
|
||||
// Enables fetching page metadata from the remote Optimization Guide service.
|
||||
BASE_FEATURE(kRemotePageMetadata,
|
||||
@@ -254,7 +234,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
|
||||
|
||||
// Enables the page entities model to be annotated on every page load.
|
||||
BASE_FEATURE(kPageEntitiesPageContentAnnotations,
|
||||
@@ -151,8 +147,8 @@ BASE_FEATURE(kPageEntitiesModelBatchEntityMetadataSimplification,
|
||||
@@ -152,8 +148,8 @@ BASE_FEATURE(kPageEntitiesModelResetOnShutdown,
|
||||
|
||||
// Enables push notification of hints.
|
||||
BASE_FEATURE(kPushNotifications,
|
||||
@@ -265,18 +245,18 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
|
||||
|
||||
// This feature flag does not turn off any behavior, it is only used for
|
||||
// experiment parameters.
|
||||
@@ -166,8 +162,8 @@ BASE_FEATURE(kOptimizationGuideMetadataValidation,
|
||||
@@ -175,8 +171,8 @@ BASE_FEATURE(kPageContentAnnotationsValidation,
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
BASE_FEATURE(kPageTopicsBatchAnnotations,
|
||||
- "PageTopicsBatchAnnotations",
|
||||
BASE_FEATURE(kPreventLongRunningPredictionModels,
|
||||
- "PreventLongRunningPredictionModels",
|
||||
- base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
+ "PageTopicsBatchAnnotations", // disabled by default
|
||||
+ "PreventLongRunningPredictionModels", // disabled by default
|
||||
+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
|
||||
BASE_FEATURE(kPageVisibilityBatchAnnotations,
|
||||
"PageVisibilityBatchAnnotations",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
@@ -426,7 +422,7 @@ size_t MaxURLKeyedHintCacheSize() {
|
||||
|
||||
BASE_FEATURE(kOptimizationGuideUseContinueOnShutdownForPageContentAnnotations,
|
||||
"OptimizationGuideUseContinueOnShutdownForPageContentAnnotations",
|
||||
@@ -438,7 +434,7 @@ size_t MaxURLKeyedHintCacheSize() {
|
||||
|
||||
bool ShouldPersistHintsToDisk() {
|
||||
return GetFieldTrialParamByFeatureAsBool(kOptimizationHints,
|
||||
@@ -349,7 +329,7 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
|
||||
diff --git a/components/permissions/features.cc b/components/permissions/features.cc
|
||||
--- a/components/permissions/features.cc
|
||||
+++ b/components/permissions/features.cc
|
||||
@@ -85,12 +85,12 @@ const base::FeatureParam<int> kPermissionChipAutoDismissDelay{
|
||||
@@ -82,12 +82,12 @@ BASE_FEATURE(kFailFastQuietChip,
|
||||
// When enabled, use the value of the `service_url` FeatureParam as the url
|
||||
// for the Web Permission Predictions Service.
|
||||
BASE_FEATURE(kPermissionPredictionServiceUseUrlOverride,
|
||||
@@ -387,7 +367,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -2739,7 +2739,7 @@
|
||||
@@ -2813,7 +2813,7 @@
|
||||
{
|
||||
// https://crbug.com/1126305
|
||||
name: "Prerender2",
|
||||
|
||||
Reference in New Issue
Block a user