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

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

Issue 2766353002: Merge the patch back into M57 (Closed)
Patch Set: Created 3 years, 9 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 | « no previous file | third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index e6b321c4e17c65b3e653a08494f6c5b38d094a3e..8c9c9417c513cfe9c1090d734776f6735bcc1f17 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -4896,8 +4896,6 @@ MainThreadScrollingReasons FrameView::mainThreadScrollingReasonsPerFrame()
if (hasBackgroundAttachmentFixedObjects())
reasons |= MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects;
- reasons |= getStyleRelatedMainThreadScrollingReasons();
-
ScrollingReasons scrollingReasons = getScrollingReasons();
const bool mayBeScrolledByInput = (scrollingReasons == Scrollable);
const bool mayBeScrolledByScript =
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698