147 lines
7.0 KiB
Diff
147 lines
7.0 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Sat, 22 Aug 2020 12:46:20 +0200
|
|
Subject: Disable text fragments by default
|
|
|
|
Revert "[Text Fragment] Unflag fragment directive removal."
|
|
|
|
Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|
---
|
|
chrome/browser/about_flags.cc | 5 +++++
|
|
chrome/browser/flag-metadata.json | 5 +++++
|
|
chrome/browser/flag_descriptions.cc | 4 ++++
|
|
chrome/browser/flag_descriptions.h | 3 +++
|
|
chrome/browser/ui/prefs/prefs_tab_helper.cc | 2 +-
|
|
content/child/runtime_features.cc | 2 +-
|
|
third_party/blink/common/features.cc | 2 +-
|
|
third_party/blink/renderer/core/dom/document.cc | 5 +++++
|
|
.../blink/renderer/platform/runtime_enabled_features.json5 | 3 +--
|
|
9 files changed, 26 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
|
--- a/chrome/browser/about_flags.cc
|
|
+++ b/chrome/browser/about_flags.cc
|
|
@@ -5955,6 +5955,11 @@ const FeatureEntry kFeatureEntries[] = {
|
|
"")},
|
|
#endif
|
|
|
|
+ {"enable-text-fragment-anchor",
|
|
+ flag_descriptions::kEnableTextFragmentAnchorName,
|
|
+ flag_descriptions::kEnableTextFragmentAnchorDescription, kOsAll,
|
|
+ FEATURE_VALUE_TYPE(blink::features::kTextFragmentAnchor)},
|
|
+
|
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
{"enable-web-authentication-chromeos-authenticator",
|
|
flag_descriptions::kEnableWebAuthenticationChromeOSAuthenticatorName,
|
|
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
|
|
--- a/chrome/browser/flag-metadata.json
|
|
+++ b/chrome/browser/flag-metadata.json
|
|
@@ -2636,6 +2636,11 @@
|
|
"owners": [ "alionadangla", "bwwilliams", "bling-flags@google.com"],
|
|
"expiry_milestone": 105
|
|
},
|
|
+ {
|
|
+ "name": "enable-text-fragment-anchor",
|
|
+ "owners": [ "bokan", "input-dev" ],
|
|
+ "expiry_milestone": -1
|
|
+ },
|
|
{
|
|
"name": "enable-payment-request-basic-card",
|
|
"owners": [ "web-payments-team@google.com" ],
|
|
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
|
|
@@ -1373,6 +1373,10 @@ const char kEnableRestrictedWebApisDescription[] =
|
|
"Enable the restricted web APIs for dev trial. This will be replaced with "
|
|
"permission policies to control the capabilities afterwards.";
|
|
|
|
+const char kEnableTextFragmentAnchorName[] = "Enable Text Fragment Anchor.";
|
|
+const char kEnableTextFragmentAnchorDescription[] =
|
|
+ "Enables scrolling to text specified in URL's fragment.";
|
|
+
|
|
const char kEnableUseZoomForDsfName[] =
|
|
"Use Blink's zoom for device scale factor.";
|
|
const char kEnableUseZoomForDsfDescription[] =
|
|
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
|
|
@@ -764,6 +764,9 @@ extern const char
|
|
extern const char kEnableRestrictedWebApisName[];
|
|
extern const char kEnableRestrictedWebApisDescription[];
|
|
|
|
+extern const char kEnableTextFragmentAnchorName[];
|
|
+extern const char kEnableTextFragmentAnchorDescription[];
|
|
+
|
|
extern const char kEnableUseZoomForDsfName[];
|
|
extern const char kEnableUseZoomForDsfDescription[];
|
|
extern const char kEnableUseZoomForDsfChoiceDefault[];
|
|
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
|
|
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
|
|
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
|
|
@@ -361,7 +361,7 @@ void PrefsTabHelper::RegisterProfilePrefs(
|
|
prefs::kEnableReferrers,
|
|
!base::FeatureList::IsEnabled(features::kNoReferrers));
|
|
registry->RegisterBooleanPref(prefs::kEnableEncryptedMedia, true);
|
|
- registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, true);
|
|
+ registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, false);
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
registry->RegisterDoublePref(browser_ui::prefs::kWebKitFontScaleFactor, 1.0);
|
|
registry->RegisterBooleanPref(browser_ui::prefs::kWebKitForceEnableZoom,
|
|
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
|
|
--- a/content/child/runtime_features.cc
|
|
+++ b/content/child/runtime_features.cc
|
|
@@ -283,7 +283,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
|
|
{wf::EnableSpeculationRulesPrefetchProxy,
|
|
blink::features::kSpeculationRulesPrefetchProxy, kSetOnlyIfOverridden},
|
|
{wf::EnableSubresourceWebBundles, features::kSubresourceWebBundles},
|
|
- {wf::EnableTextFragmentAnchor, blink::features::kTextFragmentAnchor},
|
|
+ {wf::EnableTextFragmentAnchor, blink::features::kTextFragmentAnchor}, // will set the TextFragmentIdentifiers runtime feature
|
|
{wf::EnableTouchDragAndContextMenu, features::kTouchDragAndContextMenu},
|
|
{wf::EnableCSSSelectorFragmentAnchor,
|
|
blink::features::kCssSelectorFragmentAnchor},
|
|
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
|
--- a/third_party/blink/common/features.cc
|
|
+++ b/third_party/blink/common/features.cc
|
|
@@ -521,7 +521,7 @@ const base::Feature kStopInBackground {
|
|
|
|
// Enable text snippets in URL fragments. https://crbug.com/919204.
|
|
const base::Feature kTextFragmentAnchor{"TextFragmentAnchor",
|
|
- base::FEATURE_ENABLED_BY_DEFAULT};
|
|
+ base::FEATURE_DISABLED_BY_DEFAULT};
|
|
|
|
// Enables CSS selector fragment anchors. https://crbug.com/1252460
|
|
const base::Feature kCssSelectorFragmentAnchor{
|
|
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
|
|
--- a/third_party/blink/renderer/core/dom/document.cc
|
|
+++ b/third_party/blink/renderer/core/dom/document.cc
|
|
@@ -4241,9 +4241,14 @@ void Document::SetURL(const KURL& url) {
|
|
TRACE_EVENT1("navigation", "Document::SetURL", "url",
|
|
new_url.GetString().Utf8());
|
|
|
|
+ // If text fragment identifiers are enabled, we strip the fragment directive
|
|
+ // from the URL fragment.
|
|
+ // E.g. "#id:~:text=a" --> "#id"
|
|
+ if (RuntimeEnabledFeatures::TextFragmentIdentifiersEnabled(domWindow())) {
|
|
// Strip the fragment directive from the URL fragment. E.g. "#id:~:text=a"
|
|
// --> "#id". See https://github.com/WICG/scroll-to-text-fragment.
|
|
new_url = fragment_directive_->ConsumeFragmentDirective(new_url);
|
|
+ }
|
|
|
|
url_ = new_url;
|
|
UpdateBaseURL();
|
|
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
|
|
@@ -2243,8 +2243,7 @@
|
|
},
|
|
{
|
|
name: "TextFragmentIdentifiers",
|
|
- origin_trial_feature_name: "TextFragmentIdentifiers",
|
|
- status: "stable",
|
|
+ origin_trial_feature_name: "TextFragmentIdentifiers"
|
|
},
|
|
{
|
|
name: "TextFragmentTapOpensContextMenu",
|
|
--
|
|
2.25.1
|