Skip to content

GitLab

T
tangled
Commit c5b24f8c authored by David Bokan's avatar David Bokan Committed by Commit Bot
Browse files
Options

Fix ScrollFocusedEditableIntoView for selections 

This method is used to scroll and zoom an editable element into view and
to a legible scale. This generally happens on Android where the
on-screen keyboard appears and the input box is zoomed into the
viewport.

The linked bug occurs because we try to zoom the input box while it has
a selection (e.g Ctrl-A the text) rather than a blinking caret. This
method would then receive an empty rect for the caret_rect which would
cause us to zoom into the maximum possible scale.

The fix here is to fallback to the selection rect if there is no carret.

Bug: 968638
Change-Id: I980183bf9843192e694579cf2af4af816b78a090
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1642248Reviewed-by: default avatarStefan Zager <szager@chromium.org>
Commit-Queue: David Bokan <bokan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666493}
parent 88a133da
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 3 deletions
third_party/blink/renderer/core/editing/frame_selection.h
View file @ c5b24f8c
...@@ -202,6 +202,10 @@ class CORE_EXPORT FrameSelection final ...@@ -202,6 +202,10 @@ class CORE_EXPORT FrameSelection final
// Note: this updates styles and layout, use cautiously. // Note: this updates styles and layout, use cautiously.
bool ComputeAbsoluteBounds(IntRect& anchor, IntRect& focus) const; bool ComputeAbsoluteBounds(IntRect& anchor, IntRect& focus) const;
// Computes the rect we should use when scrolling/zooming a selection into
// view.
IntRect ComputeRectToScroll(RevealExtentOption);
void DidChangeFocus(); void DidChangeFocus();
SelectionInDOMTree GetSelectionInDOMTree() const; SelectionInDOMTree GetSelectionInDOMTree() const;
...@@ -300,8 +304,6 @@ class CORE_EXPORT FrameSelection final ...@@ -300,8 +304,6 @@ class CORE_EXPORT FrameSelection final
GranularityStrategy* GetGranularityStrategy(); GranularityStrategy* GetGranularityStrategy();
IntRect ComputeRectToScroll(RevealExtentOption);
void MoveRangeSelectionInternal(const SelectionInDOMTree&, TextGranularity); void MoveRangeSelectionInternal(const SelectionInDOMTree&, TextGranularity);
// Implementation of |SynchronousMutationObserver| member functions. // Implementation of |SynchronousMutationObserver| member functions.
......
third_party/blink/renderer/core/exported/web_frame_test.cc
View file @ c5b24f8c
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
#include "third_party/blink/renderer/core/fullscreen/fullscreen.h" #include "third_party/blink/renderer/core/fullscreen/fullscreen.h"
#include "third_party/blink/renderer/core/geometry/dom_rect.h" #include "third_party/blink/renderer/core/geometry/dom_rect.h"
#include "third_party/blink/renderer/core/html/forms/html_form_element.h" #include "third_party/blink/renderer/core/html/forms/html_form_element.h"
#include "third_party/blink/renderer/core/html/forms/html_input_element.h"
#include "third_party/blink/renderer/core/html/html_body_element.h" #include "third_party/blink/renderer/core/html/html_body_element.h"
#include "third_party/blink/renderer/core/html/html_iframe_element.h" #include "third_party/blink/renderer/core/html/html_iframe_element.h"
#include "third_party/blink/renderer/core/html/image_document.h" #include "third_party/blink/renderer/core/html/image_document.h"
...@@ -11743,6 +11744,58 @@ TEST_F(WebFrameSimTest, ScrollFocusedIntoViewClipped) { ...@@ -11743,6 +11744,58 @@ TEST_F(WebFrameSimTest, ScrollFocusedIntoViewClipped) {
EXPECT_GT(clip->scrollTop(), 0); EXPECT_GT(clip->scrollTop(), 0);
} }
// This test ensures that we scroll to the correct scale when the focused
// element has a selection rather than a carret.
TEST_F(WebFrameSimTest, ScrollFocusedSelectionIntoView) {
UseAndroidSettings();
WebView().MainFrameWidget()->Resize(WebSize(400, 600));
WebView().EnableFakePageScaleAnimationForTesting(true);
WebView().GetPage()->GetSettings().SetTextAutosizingEnabled(false);
SimRequest request("https://example.com/test.html", "text/html");
LoadURL("https://example.com/test.html");
request.Complete(R"HTML(
<!DOCTYPE html>
<style>
::-webkit-scrollbar {
width: 0px;
height: 0px;
}
body, html {
margin: 0px;
width: 100%;
height: 100%;
}
input {
padding: 0;
width: 100px;
height: 20px;
}
</style>
<input type="text" id="target" value="test">
)HTML");
Compositor().BeginFrame();
WebView().AdvanceFocus(false);
HTMLInputElement* input =
ToHTMLInputElement(GetDocument().getElementById("target"));
input->select();
// Simulate the keyboard being shown and resizing the widget. Cause a scroll
// into view after.
ASSERT_EQ(WebView().FakePageScaleAnimationPageScaleForTesting(), 0.f);
WebFrameWidget* widget = WebView().MainFrameImpl()->FrameWidgetImpl();
widget->ScrollFocusedEditableElementIntoView();
// Make sure zoomed in but only up to a legible scale. The bounds are
// arbitrary and fuzzy since we don't specifically care to constrain the
// amount of zooming (that should be tested elsewhere), we just care that it
// zooms but not off to infinity.
EXPECT_GT(WebView().FakePageScaleAnimationPageScaleForTesting(), .75f);
EXPECT_LT(WebView().FakePageScaleAnimationPageScaleForTesting(), 2.f);
}
TEST_F(WebFrameSimTest, DoubleTapZoomWhileScrolled) { TEST_F(WebFrameSimTest, DoubleTapZoomWhileScrolled) {
UseAndroidSettings(); UseAndroidSettings();
WebView().MainFrameWidget()->Resize(WebSize(490, 500)); WebView().MainFrameWidget()->Resize(WebSize(490, 500));
......
third_party/blink/renderer/core/exported/web_view_impl.cc
View file @ c5b24f8c
...@@ -2160,7 +2160,7 @@ bool WebViewImpl::ScrollFocusedEditableElementIntoView() { ...@@ -2160,7 +2160,7 @@ bool WebViewImpl::ScrollFocusedEditableElementIntoView() {
element->GetDocument() element->GetDocument()
.GetFrame() .GetFrame()
->Selection() ->Selection()
.AbsoluteCaretBounds())), .ComputeRectToScroll(kDoNotRevealExtent))),
ShouldZoomToLegibleScale(*element)); ShouldZoomToLegibleScale(*element));
return true; return true;
......
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