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

third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
  * reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@gmail.com>
@@ skipping 135 matching lines @@
       frame->eventHandler().resizeScrollableAreaDestroyed();
   }
 
   if (LocalFrame* frame = box().frame()) {
     if (FrameView* frameView = frame->view()) {
       frameView->removeScrollableArea(this);
       frameView->removeAnimatingScrollableArea(this);
     }
   }
 
-  removeStyleRelatedMainThreadScrollingReasons();
+  resetStyleRelatedMainThreadScrollingReasons();
 
   if (ScrollingCoordinator* scrollingCoordinator = getScrollingCoordinator())
     scrollingCoordinator->willDestroyScrollableArea(this);
 
   if (!box().documentBeingDestroyed()) {
     Node* node = box().node();
     // FIXME: Make setSavedLayerScrollOffset take DoubleSize. crbug.com/414283.
     if (node && node->isElementNode())
       toElement(node)->setSavedLayerScrollOffset(m_scrollOffset);
   }
@@ skipping 1614 matching lines @@
   if (node && node->isElementNode() &&
       (toElement(node)->compositorMutableProperties() &
        (CompositorMutableProperty::kScrollTop |
         CompositorMutableProperty::kScrollLeft)))
     return true;
 
   if (layer->size().isEmpty())
     return false;
 
   bool needsCompositedScrolling = true;
-  uint32_t mainThreadScrollingReasons = 0;
 
   // TODO(flackr): Allow integer transforms as long as all of the ancestor
   // transforms are also integer.
   bool backgroundSupportsLCDText =
       RuntimeEnabledFeatures::compositeOpaqueScrollersEnabled() &&
       layer->layoutObject().style()->isStackingContext() &&
-      layer->backgroundPaintLocation(&mainThreadScrollingReasons) &
+      layer->backgroundPaintLocation(&m_reasons) &
           BackgroundPaintInScrollingContents &&
       layer->backgroundIsKnownToBeOpaqueInRect(
           toLayoutBox(layer->layoutObject()).paddingBoxRect()) &&
       !layer->compositesWithTransform() && !layer->compositesWithOpacity();
 
   if (mode == PaintLayerScrollableArea::ConsiderLCDText &&
       !layer->compositor()->preferCompositingToLCDTextEnabled() &&
       !backgroundSupportsLCDText) {
     if (layer->compositesWithOpacity()) {
-      mainThreadScrollingReasons |=
-          MainThreadScrollingReason::kHasOpacityAndLCDText;
+      m_reasons |= MainThreadScrollingReason::kHasOpacityAndLCDText;
     }
     if (layer->compositesWithTransform()) {
-      mainThreadScrollingReasons |=
-          MainThreadScrollingReason::kHasTransformAndLCDText;
+      m_reasons |= MainThreadScrollingReason::kHasTransformAndLCDText;
     }
     if (!layer->backgroundIsKnownToBeOpaqueInRect(
             toLayoutBox(layer->layoutObject()).paddingBoxRect())) {
-      mainThreadScrollingReasons |=
+      m_reasons |=
           MainThreadScrollingReason::kBackgroundNotOpaqueInRectAndLCDText;
     }
 
     needsCompositedScrolling = false;
   }
 
   // TODO(schenney) Tests fail if we do not also exclude
   // layer->layoutObject().style()->hasBorderDecoration() (missing background
   // behind dashed borders). Resolve this case, or not, and update this check
   // with the results.
   if (layer->layoutObject().style()->hasBorderRadius()) {
-    mainThreadScrollingReasons |= MainThreadScrollingReason::kHasBorderRadius;
+    m_reasons |= MainThreadScrollingReason::kHasBorderRadius;
     needsCompositedScrolling = false;
   }
   if (layer->layoutObject().hasClip() || layer->hasDescendantWithClipPath() ||
       layer->hasAncestorWithClipPath()) {
-    mainThreadScrollingReasons |=
-        MainThreadScrollingReason::kHasClipRelatedProperty;
+    m_reasons |= MainThreadScrollingReason::kHasClipRelatedProperty;
     needsCompositedScrolling = false;
   }
 
-  if (mainThreadScrollingReasons) {
-    addStyleRelatedMainThreadScrollingReasons(mainThreadScrollingReasons);
-  }
-
   return needsCompositedScrolling;
 }
 
-void PaintLayerScrollableArea::addStyleRelatedMainThreadScrollingReasons(
-    const uint32_t reasons) {
-  LocalFrame* frame = box().frame();
-  if (!frame)
-    return;
-  FrameView* frameView = frame->view();
-  if (!frameView)
-    return;
-
-  for (uint32_t reason = 1;
-       reason < 1 << MainThreadScrollingReason::kMainThreadScrollingReasonCount;
-       reason <<= 1) {
-    if (reasons & reason) {
-      frameView->adjustStyleRelatedMainThreadScrollingReasons(reason, true);
-      m_reasons |= reason;
-    }
-  }
-}
-
-void PaintLayerScrollableArea::removeStyleRelatedMainThreadScrollingReasons() {
-  LocalFrame* frame = box().frame();
-  if (!frame)
-    return;
-  FrameView* frameView = frame->view();
-  if (!frameView)
-    return;
-
-  // Decrease the number of layers that have any main thread
-  // scrolling reasons stored in FrameView
-  for (uint32_t i = 0;
-       i < MainThreadScrollingReason::kMainThreadScrollingReasonCount; ++i) {
-    uint32_t reason = 1 << i;
-    if (hasMainThreadScrollingReason(reason)) {
-      m_reasons &= ~reason;
-      frameView->adjustStyleRelatedMainThreadScrollingReasons(reason, false);
-    }
-  }
-}
-
 void PaintLayerScrollableArea::updateNeedsCompositedScrolling(
     LCDTextMode mode) {
   // Clear all style related main thread scrolling reasons, if any,
   // before calling computeNeedsCompositedScrolling
-  removeStyleRelatedMainThreadScrollingReasons();
+  resetStyleRelatedMainThreadScrollingReasons();

[bokan, 2017/03/24 17:55:54]

We should reset the reasons inside computeNeedsCompositedScrolling.

[yigu, 2017/03/27 21:02:07]

Done.

   const bool needsCompositedScrolling =
       computeNeedsCompositedScrolling(mode, layer());
 
   if (static_cast<bool>(m_needsCompositedScrolling) !=
       needsCompositedScrolling) {
     m_needsCompositedScrolling = needsCompositedScrolling;
     layer()->didUpdateNeedsCompositedScrolling();
   }
 }
 
@@ skipping 251 matching lines @@
 
 void PaintLayerScrollableArea::DelayScrollOffsetClampScope::
     clampScrollableAreas() {
   for (auto& scrollableArea : *s_needsClamp)
     scrollableArea->clampScrollOffsetAfterOverflowChange();
   delete s_needsClamp;
   s_needsClamp = nullptr;
 }
 
 }  // namespace blink