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

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

Issue 882153004: Re-enable main-frame and subframe CSSOM smooth scroll layout tests (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use nullptr instead of 0 Created 5 years, 10 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
« no previous file with comments | « LayoutTests/fast/scroll-behavior/subframe-scrollTop.html ('k') | no next file » | 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 292ab83a238eeb5de539a80a92d665646e848033..97e05ed8a90850b646a1281a5db831089f0ea822 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -1550,7 +1550,8 @@ void FrameView::setScrollPosition(const DoublePoint& scrollPoint, ScrollBehavior
return;
if (scrollBehavior == ScrollBehaviorAuto) {
- RenderObject* renderer = m_frame->document()->documentElement() ? m_frame->document()->documentElement()->renderer() : 0;
+ Element* scrollElement = RuntimeEnabledFeatures::scrollTopLeftInteropEnabled() ? m_frame->document()->documentElement() : m_frame->document()->body();
+ RenderObject* renderer = scrollElement ? scrollElement->renderer() : nullptr;
if (renderer && renderer->style()->scrollBehavior() == ScrollBehaviorSmooth)
scrollBehavior = ScrollBehaviorSmooth;
else
« no previous file with comments | « LayoutTests/fast/scroll-behavior/subframe-scrollTop.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698