| Index: third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| index 9793a7e6714b61b6a6e07379afc26ae23cf00e83..d7549b36b16427947a3d47ed885be8d732191523 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| @@ -837,8 +837,10 @@ void LayoutBlock::startDelayUpdateScrollInfo()
|
| ++gDelayUpdateScrollInfo;
|
| }
|
|
|
| -void LayoutBlock::finishDelayUpdateScrollInfo()
|
| +bool LayoutBlock::finishDelayUpdateScrollInfo(SubtreeLayoutScope* layoutScope)
|
| {
|
| + bool childrenMarkedForRelayout = false;
|
| +
|
| --gDelayUpdateScrollInfo;
|
| ASSERT(gDelayUpdateScrollInfo >= 0);
|
| if (gDelayUpdateScrollInfo == 0) {
|
| @@ -849,10 +851,11 @@ void LayoutBlock::finishDelayUpdateScrollInfo()
|
|
|
| for (auto* block : *infoSet) {
|
| if (block->hasOverflowClip()) {
|
| - block->layer()->scrollableArea()->updateAfterLayout();
|
| + childrenMarkedForRelayout |= block->layer()->scrollableArea()->updateAfterLayout(layoutScope);
|
| }
|
| }
|
| }
|
| + return childrenMarkedForRelayout;
|
| }
|
|
|
| void LayoutBlock::updateScrollInfoAfterLayout()
|
|
|