Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 2961613002: Slightly refactor StickyPositionScrollingConstraints API and add documentation (Closed)
Patch Set: remove accidental file Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 afd92778924c0f381ab4be208aa702b9a4622bf4..2153ba8e1e63852195de962eab15c2d10ba7ec55 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -330,25 +330,22 @@ void CompositedLayerMapping::UpdateStickyConstraints(
// TODO(smcgruer): Until http://crbug.com/702229 is fixed, the nearest
// sticky layers may not be composited and we may incorrectly end up with
// invalid layer IDs.
- 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();

Powered by Google App Engine
This is Rietveld 408576698