Chromium Code Reviews| 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..804f9d8ad382c353a6aa72b918b5360ea415d6fa 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 didMarking = false; |
|
leviw_travelin_and_unemployed
2016/02/25 21:31:28
This could have a better name.
cbiesinger
2016/02/25 21:33:13
Done.
|
| + |
| --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(); |
| + didMarking |= block->layer()->scrollableArea()->updateAfterLayout(layoutScope); |
| } |
| } |
| } |
| + return didMarking; |
| } |
| void LayoutBlock::updateScrollInfoAfterLayout() |