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

Unified Diff: Source/core/frame/FrameView.cpp

Issue 766023002: Rename 'instant' value of scroll-behavior CSS property to 'auto' (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « Source/core/css/parser/CSSParserFastPaths.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 62a2de490b241d5cf68e069ce1de00603b6722d9..ce3ee12e7498ef42aa25ce10d5dbe2f06f31e512 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -1525,8 +1525,8 @@ void FrameView::setScrollPosition(const DoublePoint& scrollPoint, ScrollBehavior
if (scrollBehavior == ScrollBehaviorAuto) {
RenderObject* renderer = m_frame->document()->documentElement() ? m_frame->document()->documentElement()->renderer() : 0;
- if (renderer)
- scrollBehavior = renderer->style()->scrollBehavior();
+ if (renderer && renderer->style()->scrollBehavior() == ScrollBehaviorSmooth)
+ scrollBehavior = ScrollBehaviorSmooth;
else
scrollBehavior = ScrollBehaviorInstant;
}
« no previous file with comments | « Source/core/css/parser/CSSParserFastPaths.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698