Skip to content

GitLab

T
tangled
Commit 2b849704 authored by David Bokan's avatar David Bokan Committed by Chromium LUCI CQ
Browse files
Options

Remove ForceLoadAtTop runtime flag 

This Blink RuntimeEnabledFeature was previously used to enable this
opt-out for the TextFragment (and other kinds of load-time scrolls)
feature using an Origin-Trial.

The feature shipped for real as part of Document-Policy and the
Origin-Trial has been wound-down. This CL removes the no longer needed
RuntimeEnabledFeature.

Bug: 1047900
Change-Id: Ie8e8180aae6a9d76e4626eb2d5c8e4b3a9fb582c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2622240
Commit-Queue: David Bokan <bokan@chromium.org>
Reviewed-by: default avatarNick Burris <nburris@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843274}
parent d0b1560e
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 52 deletions
content/browser/text_fragment_browsertest.cc
View file @ 2b849704
......@@ -582,27 +582,100 @@ IN_PROC_BROWSER_TEST_F(TextFragmentAnchorBrowserTest,
EXPECT_DID_SCROLL(false);
}
// Test that Tab key press puts focus from the start of selection.
IN_PROC_BROWSER_TEST_F(TextFragmentAnchorBrowserTest, TabFocus) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL(
"/scrollable_page_with_anchor.html#:~:text=text"));
WebContents* main_contents = shell()->web_contents();
RenderFrameSubmissionObserver frame_observer(main_contents);
EXPECT_TRUE(NavigateToURL(shell(), url));
WaitForPageLoad(main_contents);
frame_observer.WaitForScrollOffsetAtTop(
/*expected_scroll_offset_at_top=*/false);
DOMMessageQueue msg_queue;
SimulateKeyPress(main_contents, ui::DomKey::TAB, ui::DomCode::TAB,
ui::VKEY_TAB, false, false, false, false);
// Wait for focus to happen.
std::string message;
EXPECT_TRUE(msg_queue.WaitForMessage(&message));
EXPECT_EQ("\"FocusDone2\"", message);
}
class ForceLoadAtTopBrowserTest : public TextFragmentAnchorBrowserTest {
protected:
void SetUpOnMainThread() override {
TextFragmentAnchorBrowserTest::SetUpOnMainThread();
// Loads the given path as predetermined HTML response with a
// |Document-Policy: force-load-at-top| header and waits for the navigation
// to finish.
void LoadScrollablePageWithContent(const std::string& path) {
std::size_t hash_pos = path.find("#");
std::string path_without_fragment = path;
if (hash_pos != std::string::npos) {
path_without_fragment = path.substr(0, hash_pos);
}
net::test_server::ControllableHttpResponse response(embedded_test_server(),
path_without_fragment);
ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL(path));
RenderFrameSubmissionObserver frame_observer(shell()->web_contents());
// Load the target document.
TestNavigationManager navigation_manager(shell()->web_contents(), url);
shell()->LoadURL(url);
// Start navigation
ASSERT_TRUE(navigation_manager.WaitForRequestStart());
navigation_manager.ResumeNavigation();
// Send Document-Policy header
response.WaitForRequest();
std::string response_string =
"HTTP/1.1 200 OK\r\n"
"Content-Type: text/html; charset=utf-8\r\n"
"Document-Policy: force-load-at-top\r\n"
"\r\n"
R"HTML(
<html>
<head>
<meta name="viewport" content="width=device-width">
<script>
let did_scroll = false;
window.addEventListener('scroll', () => {
did_scroll = true;
});
</script>
<style>
p {
position: absolute;
top: 10000px;
}
void SetUpCommandLine(base::CommandLine* command_line) override {
TextFragmentAnchorBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(switches::kEnableBlinkFeatures,
"ForceLoadAtTop");
</style>
</head>
<body>
<a id="link" href="#text">Go Down</a>
<p id="text">Some text</p>
</body>
</html>
)HTML";
response.Send(response_string);
response.Done();
ASSERT_TRUE(navigation_manager.WaitForResponse());
navigation_manager.ResumeNavigation();
navigation_manager.WaitForNavigationFinished();
}
};
// Test that scroll restoration is disabled with ForceLoadAtTop
IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, ScrollRestorationDisabled) {
GURL url(
embedded_test_server()->GetURL("/scrollable_page_with_content.html"));
ASSERT_NO_FATAL_FAILURE(LoadScrollablePageWithContent("/index.html"));
WebContents* main_contents = shell()->web_contents();
RenderFrameSubmissionObserver frame_observer(main_contents);
EXPECT_TRUE(NavigateToURL(shell(), url));
EXPECT_TRUE(WaitForRenderFrameReady(main_contents->GetMainFrame()));
// Scroll down the page a bit
......@@ -632,11 +705,9 @@ IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, ScrollRestorationDisabled) {
// Test that element fragment anchor scrolling is disabled with ForceLoadAtTop
IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, FragmentAnchorDisabled) {
GURL url(embedded_test_server()->GetURL(
"/scrollable_page_with_content.html#text"));
ASSERT_NO_FATAL_FAILURE(LoadScrollablePageWithContent("/index.html#text"));
WebContents* main_contents = shell()->web_contents();
EXPECT_TRUE(NavigateToURL(shell(), url));
EXPECT_TRUE(WaitForRenderFrameReady(main_contents->GetMainFrame()));
// Wait a short amount of time to ensure the page does not scroll.
......@@ -651,11 +722,9 @@ IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, FragmentAnchorDisabled) {
}
IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, SameDocumentNavigation) {
GURL url(
embedded_test_server()->GetURL("/scrollable_page_with_content.html"));
ASSERT_NO_FATAL_FAILURE(LoadScrollablePageWithContent("/index.html"));
WebContents* main_contents = shell()->web_contents();
EXPECT_TRUE(NavigateToURL(shell(), url));
EXPECT_TRUE(WaitForRenderFrameReady(main_contents->GetMainFrame()));
{
const cc::RenderFrameMetadata& last_metadata =
......@@ -674,12 +743,11 @@ IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, SameDocumentNavigation) {
}
IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, TextFragmentAnchorDisabled) {
GURL url(embedded_test_server()->GetURL(
"/scrollable_page_with_content.html#:~:text=text"));
ASSERT_NO_FATAL_FAILURE(
LoadScrollablePageWithContent("/index.html#:~:text=text"));
WebContents* main_contents = shell()->web_contents();
RenderFrameSubmissionObserver frame_observer(main_contents);
EXPECT_TRUE(NavigateToURL(shell(), url));
EXPECT_TRUE(WaitForRenderFrameReady(main_contents->GetMainFrame()));
// Wait a short amount of time to ensure the page does not scroll.
......@@ -693,26 +761,4 @@ IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, TextFragmentAnchorDisabled) {
EXPECT_TRUE(last_metadata.is_scroll_offset_at_top);
}
// Test that Tab key press puts focus from the start of selection.
IN_PROC_BROWSER_TEST_F(TextFragmentAnchorBrowserTest, TabFocus) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL(
"/scrollable_page_with_anchor.html#:~:text=text"));
WebContents* main_contents = shell()->web_contents();
RenderFrameSubmissionObserver frame_observer(main_contents);
EXPECT_TRUE(NavigateToURL(shell(), url));
WaitForPageLoad(main_contents);
frame_observer.WaitForScrollOffsetAtTop(
/*expected_scroll_offset_at_top=*/false);
DOMMessageQueue msg_queue;
SimulateKeyPress(main_contents, ui::DomKey::TAB, ui::DomCode::TAB,
ui::VKEY_TAB, false, false, false, false);
// Wait for focus to happen.
std::string message;
EXPECT_TRUE(msg_queue.WaitForMessage(&message));
EXPECT_EQ("\"FocusDone2\"", message);
}
} // namespace content
third_party/blink/renderer/core/loader/frame_loader.cc
View file @ 2b849704
......@@ -1248,8 +1248,7 @@ void FrameLoader::CommitDocumentLoader(
}
void FrameLoader::RestoreScrollPositionAndViewState() {
if (RuntimeEnabledFeatures::ForceLoadAtTopEnabled(frame_->DomWindow()) ||
!frame_->GetPage() || !GetDocumentLoader() ||
if (!frame_->GetPage() || !GetDocumentLoader() ||
!GetDocumentLoader()->GetHistoryItem() ||
!GetDocumentLoader()->GetHistoryItem()->GetViewState() ||
!GetDocumentLoader()->NavigationScrollAllowed()) {
......@@ -1391,13 +1390,11 @@ void FrameLoader::ProcessFragment(const KURL& url,
GetDocumentLoader()->GetInitialScrollState().did_restore_from_history ||
uses_manual_scroll_restoration;
// Scrolling at load can be blocked by document policy (or the equivalent
// ForceLoadAtTop REF currently in origin trial). This policy applies only to
// cross-document navigations.
// Scrolling at load can be blocked by document policy. This policy applies
// only to cross-document navigations.
const bool blocked_by_policy =
!is_same_document_navigation &&
(RuntimeEnabledFeatures::ForceLoadAtTopEnabled(frame_->DomWindow()) ||
!GetDocumentLoader()->NavigationScrollAllowed());
!GetDocumentLoader()->NavigationScrollAllowed();
// We should avoid scrolling the fragment if it would clobber a history
// restored scroll state but still allow it on same document navigations
......
third_party/blink/renderer/platform/runtime_enabled_features.json5
View file @ 2b849704
......@@ -931,10 +931,6 @@
// waiting for GC.
name:"ForceEagerMeasureMemory",
},
{
name: "ForceLoadAtTop",
origin_trial_feature_name: "ForceLoadAtTop",
},
{
name: "ForceOverlayFullscreenVideo",
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment