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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutGeometryMap.h

Issue 1537133002: Renaming: distinguish ancestor, container and paintInvalidationContainer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SelectionInvalidation
Patch Set: Created 5 years 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/LayoutGeometryMap.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutGeometryMap.h b/third_party/WebKit/Source/core/layout/LayoutGeometryMap.h
index 4fe2cc5fe8db044da2ed36ab49a00b3e62966471..78436b0d4d8bebb0684b2affb8f7b255259c6972 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGeometryMap.h
+++ b/third_party/WebKit/Source/core/layout/LayoutGeometryMap.h
@@ -55,13 +55,13 @@ public:
FloatRect absoluteRect(const FloatRect& rect) const
{
- return mapToContainer(rect, 0).boundingBox();
+ return mapToAncestor(rect, 0).boundingBox();
}
- // Map to a container. Will assert that the container has been pushed onto this map.
- // A null container maps through the LayoutView (including its scale transform, if any).
- // If the container is the LayoutView, the scroll offset is applied, but not the scale.
- FloatQuad mapToContainer(const FloatRect&, const LayoutBoxModelObject*) const;
+ // Map to an ancestor. Will assert that the ancestor has been pushed onto this map.
+ // A null ancestor maps through the LayoutView (including its scale transform, if any).
+ // If the ancestor is the LayoutView, the scroll offset is applied, but not the scale.
+ FloatQuad mapToAncestor(const FloatRect&, const LayoutBoxModelObject*) const;
// Called by code walking the layout or layer trees.
void pushMappingsToAncestor(const PaintLayer*, const PaintLayer* ancestorLayer);
@@ -77,7 +77,7 @@ public:
private:
void popMappingsToAncestor(const LayoutBoxModelObject*);
- void mapToContainer(TransformState&, const LayoutBoxModelObject* container = nullptr) const;
+ void mapToAncestor(TransformState&, const LayoutBoxModelObject* ancestor = nullptr) const;
void stepInserted(const LayoutGeometryMapStep&);
void stepRemoved(const LayoutGeometryMapStep&);

Powered by Google App Engine
This is Rietveld 408576698