| 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 d7deb930e29466e1cd094b316bf2bca92eafb2f8..2ac70d1953b326aca9ad1d1d1b4967d28558afd5 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp
|
| @@ -881,8 +881,10 @@ void LayoutBlock::startDelayUpdateScrollInfo()
|
| ++gDelayUpdateScrollInfo;
|
| }
|
|
|
| -void LayoutBlock::finishDelayUpdateScrollInfo()
|
| +bool LayoutBlock::finishDelayUpdateScrollInfo(SubtreeLayoutScope* layoutScope)
|
| {
|
| + bool childrenMarkedForRelayout = false;
|
| +
|
| --gDelayUpdateScrollInfo;
|
| ASSERT(gDelayUpdateScrollInfo >= 0);
|
| if (gDelayUpdateScrollInfo == 0) {
|
| @@ -893,10 +895,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()
|
|
|