| Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| index 2b11d48670b148fad2330a31a67ba95c030d952d..d613174fed0c7f6538db0cadc9127b4d1495c1d4 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| @@ -318,7 +318,8 @@ void CompositedLayerMapping::updateStickyConstraints(
|
| LayoutPoint enclosingLayerOffset;
|
| compositingContainer->convertToLayerCoords(ancestorOverflowLayer,
|
| enclosingLayerOffset);
|
| - if (compositingContainer != ancestorOverflowLayer) {
|
| + DCHECK(!scrollParent() || scrollParent() == ancestorOverflowLayer);
|
| + if (!scrollParent() && compositingContainer != ancestorOverflowLayer) {
|
| enclosingLayerOffset += LayoutSize(
|
| ancestorOverflowLayer->getScrollableArea()->getScrollOffset());
|
| }
|
|
|