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

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.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/paint/PaintLayerScrollableArea.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
index 948b6c2cc680172bba67192dbcc2c7afcbb06b5e..a268a74f369dd4415930f7e739c785ac6ff50151 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
@@ -209,13 +209,6 @@
return nullptr;
}
-SmoothScrollSequencer* PaintLayerScrollableArea::GetSmoothScrollSequencer()
- const {
- if (Page* page = Box().GetFrame()->GetPage())
- return page->GetSmoothScrollSequencer();
- return nullptr;
-}
-
GraphicsLayer* PaintLayerScrollableArea::LayerForScrolling() const {
return Layer()->HasCompositedLayerMapping()
? Layer()->GetCompositedLayerMapping()->ScrollingContentsLayer()
@@ -1738,7 +1731,6 @@
const LayoutRect& rect,
const ScrollAlignment& align_x,
const ScrollAlignment& align_y,
- bool is_smooth,
ScrollType scroll_type) {
LayoutRect local_expose_rect(
Box()
@@ -1752,14 +1744,8 @@
ScrollOffset old_scroll_offset = GetScrollOffset();
ScrollOffset new_scroll_offset(ClampScrollOffset(RoundedIntSize(
ToScrollOffset(FloatPoint(r.Location()) + old_scroll_offset))));
- if (is_smooth) {
- DCHECK(scroll_type == kProgrammaticScroll);
- GetSmoothScrollSequencer()->QueueAnimation(this, new_scroll_offset);
- } else {
- SetScrollOffset(new_scroll_offset, scroll_type, kScrollBehaviorInstant);
- }
- ScrollOffset scroll_offset_difference =
- ClampScrollOffset(new_scroll_offset) - old_scroll_offset;
+ SetScrollOffset(new_scroll_offset, scroll_type, kScrollBehaviorInstant);
+ ScrollOffset scroll_offset_difference = GetScrollOffset() - old_scroll_offset;
local_expose_rect.Move(-LayoutSize(scroll_offset_difference));
LayoutRect intersect =
« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.h ('k') | third_party/WebKit/Source/platform/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698