| 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 70dea6b62cb0a40ce685023b571b17b194d213e8..f1c6db34744bc375b16fb44675637ba6cc4232ef 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -195,7 +195,10 @@ FrameView::FrameView(LocalFrame& frame)
|
| m_needsScrollbarsUpdate(false),
|
| m_suppressAdjustViewSize(false),
|
| m_allowsLayoutInvalidationAfterLayoutClean(true),
|
| - m_mainThreadScrollingReasons(0) {
|
| + m_mainThreadScrollingReasons(0),
|
| + m_mainThreadScrollingReasonsCounter(
|
| + MainThreadScrollingReason::kMainThreadScrollingReasonCount,
|
| + 0) {
|
| init();
|
| }
|
|
|
| @@ -4785,6 +4788,9 @@ MainThreadScrollingReasons FrameView::mainThreadScrollingReasonsPerFrame()
|
|
|
| if (hasBackgroundAttachmentFixedObjects())
|
| reasons |= MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects;
|
| +
|
| + reasons |= getStyleRelatedMainThreadScrollingReasons();
|
| +
|
| ScrollingReasons scrollingReasons = getScrollingReasons();
|
| const bool mayBeScrolledByInput = (scrollingReasons == Scrollable);
|
| const bool mayBeScrolledByScript =
|
| @@ -4849,4 +4855,27 @@ String FrameView::mainThreadScrollingReasonsAsText() const {
|
| return result;
|
| }
|
|
|
| +void FrameView::adjustStyleRelatedMainThreadScrollingReasons(
|
| + const uint32_t reason,
|
| + bool increase) {
|
| + int index = MainThreadScrollingReason::getReasonIndex(reason);
|
| + DCHECK_GE(index, 0);
|
| + m_mainThreadScrollingReasonsCounter[index] += increase ? 1 : -1;
|
| + DCHECK_GE(m_mainThreadScrollingReasonsCounter[index], 0);
|
| +}
|
| +
|
| +MainThreadScrollingReasons
|
| +FrameView::getStyleRelatedMainThreadScrollingReasons() const {
|
| + MainThreadScrollingReasons reasons =
|
| + static_cast<MainThreadScrollingReasons>(0);
|
| + for (uint32_t reason = 1;
|
| + reason < MainThreadScrollingReason::kMainThreadScrollingReasonCount;
|
| + ++reason) {
|
| + if (m_mainThreadScrollingReasonsCounter[reason] > 0) {
|
| + reasons |= 1 << (reason - 1);
|
| + }
|
| + }
|
| + return reasons;
|
| +}
|
| +
|
| } // namespace blink
|
|
|