Skip to content

GitLab

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

Early-out in ScrollIntoView without LayoutObject 

Turns out we can have a focused Element that doesn't have a
LayoutObject. Just early out in this case when we try to scroll it into
view.

Bug: 833746
Change-Id: Ia68492bf5cd4cbb538b5e9c53a75433a48ac5463
Reviewed-on: https://chromium-review.googlesource.com/1015533Reviewed-by: default avatarStefan Zager <szager@chromium.org>
Commit-Queue: David Bokan <bokan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551459}
parent a28c6848
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 2 deletions
third_party/blink/renderer/core/exported/web_frame_test.cc
View file @ 35d06abf
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
#include "third_party/blink/renderer/core/frame/remote_frame.h" #include "third_party/blink/renderer/core/frame/remote_frame.h"
#include "third_party/blink/renderer/core/frame/settings.h" #include "third_party/blink/renderer/core/frame/settings.h"
#include "third_party/blink/renderer/core/frame/visual_viewport.h" #include "third_party/blink/renderer/core/frame/visual_viewport.h"
#include "third_party/blink/renderer/core/frame/web_frame_widget_base.h"
#include "third_party/blink/renderer/core/frame/web_local_frame_impl.h" #include "third_party/blink/renderer/core/frame/web_local_frame_impl.h"
#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"
...@@ -12174,6 +12175,60 @@ TEST_P(WebFrameSimTest, ChangeBackgroundColor) { ...@@ -12174,6 +12175,60 @@ TEST_P(WebFrameSimTest, ChangeBackgroundColor) {
EXPECT_EQ(SK_ColorRED, Compositor().background_color()); EXPECT_EQ(SK_ColorRED, Compositor().background_color());
} }
// Ensure we don't crash if we try to scroll into view the focused editable
// element which doesn't have a LayoutObject.
TEST_P(WebFrameSimTest, ScrollFocusedEditableIntoViewNoLayoutObject) {
WebView().Resize(WebSize(500, 600));
WebView().GetPage()->GetSettings().SetTextAutosizingEnabled(false);
SimRequest r("https://example.com/test.html", "text/html");
LoadURL("https://example.com/test.html");
r.Complete(R"HTML(
<!DOCTYPE html>
<style>
input {
position: absolute;
top: 1000px;
left: 800px;
}
@media (max-height: 500px) {
input {
display: none;
}
}
</style>
<input id="target" type="text"></input>
)HTML");
Compositor().BeginFrame();
Element* input = GetDocument().getElementById("target");
input->focus();
ScrollableArea* area = GetDocument().View()->LayoutViewportScrollableArea();
area->SetScrollOffset(ScrollOffset(0, 0), kProgrammaticScroll);
ASSERT_TRUE(input->GetLayoutObject());
ASSERT_EQ(input, WebView().FocusedElement());
ASSERT_EQ(ScrollOffset(0, 0), area->GetScrollOffset());
// The resize should cause the focused element to lose its LayoutObject. If
// this resize came from the Android on-screen keyboard, this would be
// followed by a ScrollFocusedEditableElementIntoView. Ensure we don't crash.
WebView().Resize(WebSize(500, 300));
ASSERT_FALSE(input->GetLayoutObject());
ASSERT_EQ(input, WebView().FocusedElement());
WebFrameWidget* widget = WebView().MainFrameImpl()->FrameWidgetImpl();
widget->ScrollFocusedEditableElementIntoView();
Compositor().BeginFrame();
// Shouldn't cause any scrolling either.
EXPECT_EQ(ScrollOffset(0, 0), area->GetScrollOffset());
}
TEST_P(WebFrameSimTest, DisplayNoneIFrameHasNoLayoutObjects) { TEST_P(WebFrameSimTest, DisplayNoneIFrameHasNoLayoutObjects) {
SimRequest main_resource("https://example.com/test.html", "text/html"); SimRequest main_resource("https://example.com/test.html", "text/html");
SimRequest frame_resource("https://example.com/frame.html", "text/html"); SimRequest frame_resource("https://example.com/frame.html", "text/html");
......
third_party/blink/renderer/core/exported/web_view_impl.cc
View file @ 35d06abf
...@@ -2406,13 +2406,15 @@ bool WebViewImpl::ScrollFocusedEditableElementIntoView() { ...@@ -2406,13 +2406,15 @@ bool WebViewImpl::ScrollFocusedEditableElementIntoView() {
element->GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets(); element->GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
LayoutObject* layout_object = element->GetLayoutObject();
if (!layout_object)
return false;
// Since the page has been resized, the layout may have changed. The page // Since the page has been resized, the layout may have changed. The page
// scale animation started by ZoomAndScrollToFocusedEditableRect will scroll // scale animation started by ZoomAndScrollToFocusedEditableRect will scroll
// only the visual and layout viewports. We'll call ScrollRectToVisible with // only the visual and layout viewports. We'll call ScrollRectToVisible with
// the stop_at_main_frame_layout_viewport param to ensure the element is // the stop_at_main_frame_layout_viewport param to ensure the element is
// actually visible in the page. // actually visible in the page.
LayoutObject* layout_object = element->GetLayoutObject();
DCHECK(layout_object);
WebScrollIntoViewParams params(ScrollAlignment::kAlignCenterIfNeeded, WebScrollIntoViewParams params(ScrollAlignment::kAlignCenterIfNeeded,
ScrollAlignment::kAlignCenterIfNeeded, ScrollAlignment::kAlignCenterIfNeeded,
kProgrammaticScroll, false, kProgrammaticScroll, false,
......
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