| 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 a67d5daa6b6ed92a786f29761a9469fa43a62f88..90fb2662dd3dc6a1f13060acaa69f07979cac5e0 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| @@ -319,7 +319,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());
|
| }
|
|
|