Move logic of recording main thread scrolling reasons from cc to blink::ScrollManager

third_party/WebKit/Source/core/frame/FrameView.cpp

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 06be35c16d1120abbe5f3da346e8b312e7347243..3a1de8192a5537cc6b7ed616211a494a7adcfa36 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -210,10 +210,7 @@ FrameView::FrameView(LocalFrame& frame)
       needs_scrollbars_update_(false),
       suppress_adjust_view_size_(false),
       allows_layout_invalidation_after_layout_clean_(true),
-      main_thread_scrolling_reasons_(0),
-      main_thread_scrolling_reasons_counter_(
-          MainThreadScrollingReason::kMainThreadScrollingReasonCount,
-          0) {
+      main_thread_scrolling_reasons_(0) {
   Init();
 }
 
@@ -5176,6 +5173,8 @@ void FrameView::UpdateSubFrameScrollOnMainReason(
 
   if (frame.IsMainFrame())
     main_thread_scrolling_reasons_ = reasons;
+  DCHECK(!MainThreadScrollingReason::HasNonCompositedScrollReasons(
+      main_thread_scrolling_reasons_));
 }
 
 MainThreadScrollingReasons FrameView::MainThreadScrollingReasonsPerFrame()
@@ -5234,6 +5233,7 @@ MainThreadScrollingReasons FrameView::GetMainThreadScrollingReasons() const {
         ToLocalFrame(frame)->View()->MainThreadScrollingReasonsPerFrame();
   }
 
+  DCHECK(!MainThreadScrollingReason::HasNonCompositedScrollReasons(reasons));
   return reasons;
 }
 
@@ -5267,29 +5267,6 @@ String FrameView::MainThreadScrollingReasonsAsText() const {
   return result;
 }
 
-void FrameView::AdjustStyleRelatedMainThreadScrollingReasons(
-    const uint32_t reason,
-    bool increase) {
-  int index = MainThreadScrollingReason::getReasonIndex(reason);
-  DCHECK_GE(index, 0);
-  main_thread_scrolling_reasons_counter_[index] += increase ? 1 : -1;
-  DCHECK_GE(main_thread_scrolling_reasons_counter_[index], 0);
-}
-
-MainThreadScrollingReasons
-FrameView::GetStyleRelatedMainThreadScrollingReasons() const {
-  MainThreadScrollingReasons reasons =
-      static_cast<MainThreadScrollingReasons>(0);
-  for (uint32_t reason = 0;
-       reason < MainThreadScrollingReason::kMainThreadScrollingReasonCount;
-       ++reason) {
-    if (main_thread_scrolling_reasons_counter_[reason] > 0) {
-      reasons |= 1 << reason;
-    }
-  }
-  return reasons;
-}
-
 void FrameView::SetViewportIntersectionFromParent(
     const IntRect& viewport_intersection) {
   if (remote_viewport_intersection_ != viewport_intersection) {