Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrameView.cpp

Issue 2911103002: Revert of Implement Element.scrollIntoView for scroll-behavior: smooth. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/LocalFrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrameView.cpp b/third_party/WebKit/Source/core/frame/LocalFrameView.cpp
index 0e838fd572eaefcb6bf245feb46d6d011c45ca7d..eb769944bd98255ff66d56033fe655caa5df2d80 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrameView.cpp
@@ -2127,13 +2127,6 @@
return &page->GetChromeClient();
}
-SmoothScrollSequencer* LocalFrameView::GetSmoothScrollSequencer() const {
- Page* page = GetFrame().GetPage();
- if (!page)
- return nullptr;
- return page->GetSmoothScrollSequencer();
-}
-
void LocalFrameView::ContentsResized() {
if (frame_->IsMainFrame() && frame_->GetDocument()) {
if (TextAutosizer* text_autosizer =
@@ -4617,20 +4610,14 @@
LayoutRect LocalFrameView::ScrollIntoView(const LayoutRect& rect_in_content,
const ScrollAlignment& align_x,
const ScrollAlignment& align_y,
- bool is_smooth,
ScrollType scroll_type) {
LayoutRect view_rect(VisibleContentRect());
LayoutRect expose_rect = ScrollAlignment::GetRectToExpose(
view_rect, rect_in_content, align_x, align_y);
if (expose_rect != view_rect) {
- ScrollOffset target_offset(expose_rect.X().ToFloat(),
- expose_rect.Y().ToFloat());
- if (is_smooth) {
- DCHECK(scroll_type == kProgrammaticScroll);
- GetSmoothScrollSequencer()->QueueAnimation(this, target_offset);
- } else {
- SetScrollOffset(target_offset, scroll_type);
- }
+ SetScrollOffset(
+ ScrollOffset(expose_rect.X().ToFloat(), expose_rect.Y().ToFloat()),
+ scroll_type);
}
// Scrolling the LocalFrameView cannot change the input rect's location
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrameView.h ('k') | third_party/WebKit/Source/core/frame/RootFrameViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698