Add more specific metrics for main thread scrolling reasons

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

Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
index 7d0a445d4c49cfe9bc86cec82fa8d93f46933928..d030efe8d2fae2d7a7e0b1d843356eb0875bfc77 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
@@ -106,7 +106,8 @@ PaintLayerScrollableArea::PaintLayerScrollableArea(PaintLayer& layer)
       m_scrollbarManager(*this),
       m_scrollCorner(nullptr),
       m_resizer(nullptr),
-      m_scrollAnchor(this)
+      m_scrollAnchor(this),
+      m_reasons(0)
 #if DCHECK_IS_ON()
       ,
       m_hasBeenDisposed(false)
@@ -144,6 +145,8 @@ void PaintLayerScrollableArea::dispose() {
     }
   }
 
+  removeStyleRelatedMainThreadScrollingReasons();
+
   if (ScrollingCoordinator* scrollingCoordinator = getScrollingCoordinator())
     scrollingCoordinator->willDestroyScrollableArea(this);
 
@@ -1721,8 +1724,8 @@ bool PaintLayerScrollableArea::shouldScrollOnMainThread() const {
   return ScrollableArea::shouldScrollOnMainThread();
 }
 
-static bool layerNeedsCompositedScrolling(
-    PaintLayerScrollableArea::LCDTextMode mode,
+bool PaintLayerScrollableArea::layerNeedsCompositedScrolling(
+    const LCDTextMode mode,
     const PaintLayer* layer) {
   if (!layer->scrollsOverflow())
     return false;
@@ -1743,10 +1746,16 @@ static bool layerNeedsCompositedScrolling(
       layer->backgroundIsKnownToBeOpaqueInRect(
           toLayoutBox(layer->layoutObject())->paddingBoxRect()) &&
       !layer->compositesWithTransform() && !layer->compositesWithOpacity();
+
   if (mode == PaintLayerScrollableArea::ConsiderLCDText &&
       !layer->compositor()->preferCompositingToLCDTextEnabled() &&
-      !backgroundSupportsLCDText)
+      !backgroundSupportsLCDText) {
+    if (layer->compositesWithOpacity()) {
+      addStyleRelatedMainThreadScrollingReasons(

[bokan, 2016/12/20 19:35:53]

This still has the issue I brought up in the last patchset. There's only one
place this method is called from - updateNeedsCompositedScrolling which is only
a few lines long. Just inline this entire method in there.

[yigu, 2016/12/20 19:59:31]

Renamed the method to computeNeedsCompositedScrolling to be clear.

+          MainThreadScrollingReason::kHasOpacity);
+    }
     return false;
+  }
 
   // TODO(schenney) Tests fail if we do not also exclude
   // layer->layoutObject()->style()->hasBorderDecoration() (missing background
@@ -1757,10 +1766,48 @@ static bool layerNeedsCompositedScrolling(
            layer->layoutObject()->style()->hasBorderRadius());
 }
 
+void PaintLayerScrollableArea::addStyleRelatedMainThreadScrollingReasons(
+    const uint32_t reason) {
+  LocalFrame* frame = box().frame();
+  if (!frame)
+    return;
+  FrameView* frameView = frame->view();
+  if (!frameView)
+    return;
+
+  frameView->adjustStyleRelatedMainThreadScrollingReasons(reason, true);
+
+  setMainThreadScrollingReason(reason);
+}
+
+void PaintLayerScrollableArea::removeStyleRelatedMainThreadScrollingReasons() {
+  LocalFrame* frame = box().frame();
+  if (!frame)
+    return;
+  FrameView* frameView = frame->view();
+  if (!frameView)
+    return;
+
+  // Decrese 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)) {
+      resetMainThreadScrollingReason(reason);
+      frameView->adjustStyleRelatedMainThreadScrollingReasons(reason, false);
+    }
+  }
+}
+
 void PaintLayerScrollableArea::updateNeedsCompositedScrolling(
     LCDTextMode mode) {
+  // Clear all style related main thread scrolling reasons, if any,
+  // before calling layerNeedsCompositedScrolling
+  removeStyleRelatedMainThreadScrollingReasons();
   const bool needsCompositedScrolling =
       layerNeedsCompositedScrolling(mode, layer());
+
   if (static_cast<bool>(m_needsCompositedScrolling) !=
       needsCompositedScrolling) {
     m_needsCompositedScrolling = needsCompositedScrolling;