| 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 df2fe64f9ba73cea56d3ff69c7a1c947057d48e8..59c0a99a236a4492a1b78ff821589dec4388e177 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| @@ -328,25 +328,22 @@ void CompositedLayerMapping::UpdateStickyConstraints(
|
| web_constraint.scroll_container_relative_containing_block_rect =
|
| EnclosingIntRect(
|
| constraints.ScrollContainerRelativeContainingBlockRect());
|
| - LayoutBoxModelObject* sticky_box_shifting_ancestor =
|
| - constraints.NearestStickyBoxShiftingStickyBox();
|
| + PaintLayer* sticky_box_shifting_ancestor =
|
| + constraints.NearestStickyLayerShiftingStickyBox();
|
| if (sticky_box_shifting_ancestor &&
|
| - sticky_box_shifting_ancestor->Layer()->GetCompositedLayerMapping()) {
|
| + sticky_box_shifting_ancestor->GetCompositedLayerMapping()) {
|
| web_constraint.nearest_layer_shifting_sticky_box =
|
| - sticky_box_shifting_ancestor->Layer()
|
| - ->GetCompositedLayerMapping()
|
| + sticky_box_shifting_ancestor->GetCompositedLayerMapping()
|
| ->MainGraphicsLayer()
|
| ->PlatformLayer()
|
| ->Id();
|
| }
|
| - LayoutBoxModelObject* containing_block_shifting_ancestor =
|
| - constraints.NearestStickyBoxShiftingContainingBlock();
|
| + PaintLayer* containing_block_shifting_ancestor =
|
| + constraints.NearestStickyLayerShiftingContainingBlock();
|
| if (containing_block_shifting_ancestor &&
|
| - containing_block_shifting_ancestor->Layer()
|
| - ->GetCompositedLayerMapping()) {
|
| + containing_block_shifting_ancestor->GetCompositedLayerMapping()) {
|
| web_constraint.nearest_layer_shifting_containing_block =
|
| - containing_block_shifting_ancestor->Layer()
|
| - ->GetCompositedLayerMapping()
|
| + containing_block_shifting_ancestor->GetCompositedLayerMapping()
|
| ->MainGraphicsLayer()
|
| ->PlatformLayer()
|
| ->Id();
|
|
|